From: Marek Vasut <marek.vasut@gmail.com>
To: linux-arm-kernel@lists.infreadead.org
Cc: netdev@vger.kernel.org, Marek Vasut <marek.vasut@gmail.com>,
Pradeep A Dalvi <netdev@pradeepdalvi.com>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH] FEC: Rename dev to ndev, fix compile error
Date: Tue, 7 Feb 2012 23:42:28 +0100 [thread overview]
Message-ID: <1328654548-28396-1-git-send-email-marek.vasut@gmail.com> (raw)
The following commit introduced a typo, this commit fixes it.
commit 21a4e46995fa1a76281ac0281ff837f706231a37
Author: Pradeep A Dalvi <netdev@pradeepdalvi.com>
Date: Sun Feb 5 02:50:10 2012 +0000
netdev: ethernet dev_alloc_skb to netdev_alloc_skb
Replaced deprecating dev_alloc_skb with netdev_alloc_skb in drivers/net/ethernet
- Removed extra skb->dev = dev after netdev_alloc_skb
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Pradeep A Dalvi <netdev@pradeepdalvi.com>
Cc: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/freescale/fec.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index f976619..0ee2ca7 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -711,7 +711,7 @@ fec_enet_rx(struct net_device *ndev)
* include that when passing upstream as it messes up
* bridging applications.
*/
- skb = netdev_alloc_skb(dev, pkt_len - 4 + NET_IP_ALIGN);
+ skb = netdev_alloc_skb(ndev, pkt_len - 4 + NET_IP_ALIGN);
if (unlikely(!skb)) {
printk("%s: Memory squeeze, dropping packet.\n",
@@ -1210,7 +1210,7 @@ static int fec_enet_alloc_buffers(struct net_device *ndev)
bdp = fep->rx_bd_base;
for (i = 0; i < RX_RING_SIZE; i++) {
- skb = netdev_alloc_skb(dev, FEC_ENET_RX_FRSIZE);
+ skb = netdev_alloc_skb(ndev, FEC_ENET_RX_FRSIZE);
if (!skb) {
fec_enet_free_buffers(ndev);
return -ENOMEM;
--
1.7.8.3
next reply other threads:[~2012-02-07 22:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-07 22:42 Marek Vasut [this message]
2012-02-08 0:04 ` [PATCH] FEC: Rename dev to ndev, fix compile error David Miller
2012-02-08 0:09 ` Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1328654548-28396-1-git-send-email-marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-arm-kernel@lists.infreadead.org \
--cc=netdev@pradeepdalvi.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).