* [PATCH] FEC: Rename dev to ndev, fix compile error
@ 2012-02-07 22:42 Marek Vasut
2012-02-08 0:04 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Marek Vasut @ 2012-02-07 22:42 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: netdev, Marek Vasut, Pradeep A Dalvi, David S. Miller
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] FEC: Rename dev to ndev, fix compile error
2012-02-07 22:42 [PATCH] FEC: Rename dev to ndev, fix compile error Marek Vasut
@ 2012-02-08 0:04 ` David Miller
2012-02-08 0:09 ` Marek Vasut
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2012-02-08 0:04 UTC (permalink / raw)
To: marek.vasut; +Cc: linux-arm-kernel, netdev, netdev
From: Marek Vasut <marek.vasut@gmail.com>
Date: Tue, 7 Feb 2012 23:42:28 +0100
> 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>
This is already fixed in the net-next tree.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] FEC: Rename dev to ndev, fix compile error
2012-02-08 0:04 ` David Miller
@ 2012-02-08 0:09 ` Marek Vasut
0 siblings, 0 replies; 3+ messages in thread
From: Marek Vasut @ 2012-02-08 0:09 UTC (permalink / raw)
To: David Miller; +Cc: linux-arm-kernel, netdev, netdev
> From: Marek Vasut <marek.vasut@gmail.com>
> Date: Tue, 7 Feb 2012 23:42:28 +0100
>
> > 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>
>
> This is already fixed in the net-next tree.
Right, it wasn't in -next so I sent it. Thanks
M
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-08 0:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-07 22:42 [PATCH] FEC: Rename dev to ndev, fix compile error Marek Vasut
2012-02-08 0:04 ` David Miller
2012-02-08 0:09 ` Marek Vasut
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).