From 54d5015970e2f1c1d8143e234ebdcce4393e9479 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Sat, 22 Oct 2011 03:29:53 -0400 Subject: [PATCH] --- yaml --- r: 266931 b: refs/heads/master c: f7ff19871bb4a3451e1ca2cf660bf633018cfbec h: refs/heads/master i: 266929: 4fa20efbcdfc56244519b11710cb5fc60dbe9b49 266927: ecd63213e39f63e30028cc7cb58e590efa9885dd v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 319c8f0cd7f2..8387d2f1264b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 580043a27da2bd8201ee321a0d5550c629fcab8d +refs/heads/master: f7ff19871bb4a3451e1ca2cf660bf633018cfbec diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index c11a2b8327f3..d469004704ad 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -6029,12 +6029,12 @@ static void tg3_tx_skb_unmap(struct tg3_napi *tnapi, u32 entry, int last) /* Workaround 4GB and 40-bit hardware DMA bugs. */ static int tigon3_dma_hwbug_workaround(struct tg3_napi *tnapi, - struct sk_buff *skb, + struct sk_buff **pskb, u32 *entry, u32 *budget, u32 base_flags, u32 mss, u32 vlan) { struct tg3 *tp = tnapi->tp; - struct sk_buff *new_skb; + struct sk_buff *new_skb, *skb = *pskb; dma_addr_t new_addr = 0; int ret = 0; @@ -6076,7 +6076,7 @@ static int tigon3_dma_hwbug_workaround(struct tg3_napi *tnapi, } dev_kfree_skb(skb); - + *pskb = new_skb; return ret; } @@ -6305,7 +6305,7 @@ static netdev_tx_t tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) */ entry = tnapi->tx_prod; budget = tg3_tx_avail(tnapi); - if (tigon3_dma_hwbug_workaround(tnapi, skb, &entry, &budget, + if (tigon3_dma_hwbug_workaround(tnapi, &skb, &entry, &budget, base_flags, mss, vlan)) goto out_unlock; }