Attachment 276391 Details for Bug 408891 – debug patch

[patch] debug patch

tg3-frags.diff (text/plain), 2.18 KB, created by Michael Chan on 2007-12-03 23:19:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Chan

Created: 2007-12-03 23:19:51 UTC

Size: 2.18 KB

patch

obsolete

>diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
>index 4942f7d..6cd6c2f 100644
>--- a/drivers/net/tg3.c
>+++ b/drivers/net/tg3.c
>@@ -3244,7 +3244,11 @@ static void tg3_tx(struct tg3 *tp)
> 		struct tx_ring_info *ri = &tp->tx_buffers[sw_idx];
> 		struct sk_buff *skb = ri->skb;
> 		int i, tx_bug = 0;
>+		int frags = ri->frags;
> 
>+		if (frags != skb_shinfo(skb)->nr_frags) {
>+			printk(KERN_ALERT "skb frags corrupted: orig: %d now: %d\n", frags, skb_shinfo(skb)->nr_frags);
>+		}
> 		if (unlikely(skb == NULL)) {
> 			tg3_tx_recover(tp);
> 			return;
>@@ -3259,7 +3263,7 @@ static void tg3_tx(struct tg3 *tp)
> 
> 		sw_idx = NEXT_TX(sw_idx);
> 
>-		for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
>+		for (i = 0; i < frags; i++) {
> 			ri = &tp->tx_buffers[sw_idx];
> 			if (unlikely(ri->skb != NULL || sw_idx == hw_idx))
> 				tx_bug = 1;
>@@ -4025,6 +4029,7 @@ static int tigon3_dma_hwbug_workaround(struct tg3 *tp, struct sk_buff *skb,
> 				 len, PCI_DMA_TODEVICE);
> 		if (i == 0) {
> 			tp->tx_buffers[entry].skb = new_skb;
>+			tp->tx_buffers[entry].frags = skb_shinfo(skb)->nr_frags;
> 			pci_unmap_addr_set(&tp->tx_buffers[entry], mapping, new_addr);
> 		} else {
> 			tp->tx_buffers[entry].skb = NULL;
>@@ -4131,6 +4136,7 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
> 	mapping = pci_map_single(tp->pdev, skb->data, len, PCI_DMA_TODEVICE);
> 
> 	tp->tx_buffers[entry].skb = skb;
>+	tp->tx_buffers[entry].frags = skb_shinfo(skb)->nr_frags;
> 	pci_unmap_addr_set(&tp->tx_buffers[entry], mapping, mapping);
> 
> 	tg3_set_txd(tp, entry, mapping, len, base_flags,
>@@ -4308,6 +4314,7 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)
> 	mapping = pci_map_single(tp->pdev, skb->data, len, PCI_DMA_TODEVICE);
> 
> 	tp->tx_buffers[entry].skb = skb;
>+	tp->tx_buffers[entry].frags = skb_shinfo(skb)->nr_frags;
> 	pci_unmap_addr_set(&tp->tx_buffers[entry], mapping, mapping);
> 
> 	would_hit_hwbug = 0;
>diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
>index da18fb2..a2e3fb2 100644
>--- a/drivers/net/tg3.h
>+++ b/drivers/net/tg3.h
>@@ -2091,6 +2091,7 @@ struct tx_ring_info {
> 	struct sk_buff			*skb;
> 	DECLARE_PCI_UNMAP_ADDR(mapping)
> 	u32				prev_vlan_tag;
>+	int				frags;
> };
> 
> struct tg3_config_info {

Actions: View | Diff

Attachments on bug 408891: 275921 | 276391 | 307231