netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH RESEND] FEC: Rename dev to ndev, fix compile error
@ 2012-02-07 22:44 Marek Vasut
  2012-02-07 23:31 ` Fabio Estevam
  0 siblings, 1 reply; 3+ messages in thread
From: Marek Vasut @ 2012-02-07 22:44 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(-)

RESEND: Typo in list address

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 RESEND] FEC: Rename dev to ndev, fix compile error
  2012-02-07 22:44 [PATCH RESEND] FEC: Rename dev to ndev, fix compile error Marek Vasut
@ 2012-02-07 23:31 ` Fabio Estevam
  2012-02-07 23:37   ` Marek Vasut
  0 siblings, 1 reply; 3+ messages in thread
From: Fabio Estevam @ 2012-02-07 23:31 UTC (permalink / raw)
  To: Marek Vasut; +Cc: linux-arm-kernel, netdev, Pradeep A Dalvi, David S. Miller

Hi Marek,

On Tue, Feb 7, 2012 at 8:44 PM, Marek Vasut <marek.vasut@gmail.com> wrote:
> 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>

I have already sent a fix for this issue and David has applied it.

Regards,

Fabio Estevam

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH RESEND] FEC: Rename dev to ndev, fix compile error
  2012-02-07 23:31 ` Fabio Estevam
@ 2012-02-07 23:37   ` Marek Vasut
  0 siblings, 0 replies; 3+ messages in thread
From: Marek Vasut @ 2012-02-07 23:37 UTC (permalink / raw)
  To: Fabio Estevam; +Cc: linux-arm-kernel, netdev, Pradeep A Dalvi, David S. Miller

> Hi Marek,
> 
> On Tue, Feb 7, 2012 at 8:44 PM, Marek Vasut <marek.vasut@gmail.com> wrote:
> > 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>
> 
> I have already sent a fix for this issue and David has applied it.
> 
> Regards,
> 
> Fabio Estevam

It wasn't in next ... all right, drop this patch.

M

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-02-07 23:37 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:44 [PATCH RESEND] FEC: Rename dev to ndev, fix compile error Marek Vasut
2012-02-07 23:31 ` Fabio Estevam
2012-02-07 23:37   ` 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).