Home » Mailing list archives » linux-netdev » 2010 » February » 20

[PATCH 2/2] b44: use netdev_alloc_skb instead of dev_alloc_skb

Previous thread: [net-next-2.6 PATCH 0/7] xfrm by MARK by jamal on Saturday, February 20, 2010 - 1:55 pm. (10 messages)

Next thread: [PATCH 1/2] b44: Set PHY address to NO_PHY if reset fails. by Hauke Mehrtens on Saturday, February 20, 2010 - 1:55 pm. (2 messages)
[view original message]
From: Hauke Mehrtens
Subject: [PATCH 2/2] b44: use netdev_alloc_skb instead of dev_alloc_skb
Date: Saturday, February 20, 2010 - 1:55 pm

The conversion in bf0dcbd929faf036f1a4f2918090344d0e249cf5 missed the
new allocation in b44_rx.
This patch was used in OpenWRT for a long time.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 drivers/net/b44.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 71fa0be..bcb6a02 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -809,7 +809,7 @@ static int b44_rx(struct b44 *bp, int budget)
 			struct sk_buff *copy_skb;
 
 			b44_recycle_rx(bp, cons, bp->rx_prod);
-			copy_skb = dev_alloc_skb(len + 2);
+			copy_skb = netdev_alloc_skb(bp->dev, len + 2);
 			if (copy_skb == NULL)
 				goto drop_it_no_recycle;
 
-- 
1.6.3.3

--


[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH 2/2] b44: use netdev_alloc_skb instead of dev_alloc_skb
Date: Monday, February 22, 2010 - 4:46 pm

From: Hauke Mehrtens <hauke@hauke-m.de>

Applied.
--


[ message continues ]
Previous thread: [net-next-2.6 PATCH 0/7] xfrm by MARK by jamal on Saturday, February 20, 2010 - 1:55 pm. (10 messages)

Next thread: [PATCH 1/2] b44: Set PHY address to NO_PHY if reset fails. by Hauke Mehrtens on Saturday, February 20, 2010 - 1:55 pm. (2 messages)