From 64a45aa3ed8dd0b50e45531b743f23e6837299c3 Mon Sep 17 00:00:00 2001
From: Nick Nunley <nicholasx.d.nunley@intel.com>
Date: Wed, 17 Feb 2010 01:04:37 +0000
Subject: [PATCH] --- yaml --- r: 184269 b: refs/heads/master c:
 40e90c26f573fa5082be6e046b346e19ab0cd25f h: refs/heads/master i:   184267:
 46d6187f30dca754e4b951de42ffac4e269e7d51 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/igb/igb.h      | 1 +
 trunk/drivers/net/igb/igb_main.c | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 143db21136d1..345e40eb6f71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 717ba0893508c2c8706c1408c152aa6d286d5d80
+refs/heads/master: 40e90c26f573fa5082be6e046b346e19ab0cd25f
diff --git a/trunk/drivers/net/igb/igb.h b/trunk/drivers/net/igb/igb.h
index 8f07bc0a1d4c..7854b66648c7 100644
--- a/trunk/drivers/net/igb/igb.h
+++ b/trunk/drivers/net/igb/igb.h
@@ -141,6 +141,7 @@ struct igb_buffer {
 			u16 length;
 			u16 next_to_watch;
 			u16 mapped_as_page;
+			u16 gso_segs;
 		};
 		/* RX */
 		struct {
diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c
index a1fe581febc0..91c123f9df92 100644
--- a/trunk/drivers/net/igb/igb_main.c
+++ b/trunk/drivers/net/igb/igb_main.c
@@ -3641,6 +3641,7 @@ static inline int igb_tx_map_adv(struct igb_ring *tx_ring, struct sk_buff *skb,
 	}
 
 	tx_ring->buffer_info[i].skb = skb;
+	tx_ring->buffer_info[i].gso_segs = skb_shinfo(skb)->gso_segs ?: 1;
 	tx_ring->buffer_info[first].next_to_watch = i;
 
 	return ++count;
@@ -5032,7 +5033,7 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)
 			if (skb) {
 				unsigned int segs, bytecount;
 				/* gso_segs is currently only valid for tcp */
-				segs = skb_shinfo(skb)->gso_segs ?: 1;
+				segs = buffer_info->gso_segs;
 				/* multiply data chunks by size of headers */
 				bytecount = ((segs - 1) * skb_headlen(skb)) +
 					    skb->len;