[kernel] r18173 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sat Oct 22 00:07:42 2011
New Revision: 18173

Log:
Really fix bugs in IPv6 forwarding with GRO/GSO (Closes: #630730)

- e1000e,igb,igbvf,ixgbe: Fix IPv6 GSO type checks
- ipv6: Add GSO support on forwarding path

I failed to add these to the series file for 36.

Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/bugfix/all/net-fix-ipv6-gso-type-checks-in-intel-ethernet-drivers.patch
   dists/squeeze/linux-2.6/debian/patches/series/39

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Wed Oct 19 19:05:00 2011	(r18172)
+++ dists/squeeze/linux-2.6/debian/changelog	Sat Oct 22 00:07:42 2011	(r18173)
@@ -1,8 +1,14 @@
 linux-2.6 (2.6.32-39) UNRELEASED; urgency=low
 
+  [ Ian Campbell ]
   * xen: Revert "xen: Use IRQF_FORCE_RESUME". Fixes live migration regression
     in 2.6.32.42. (Closes: #644604)
 
+  [ Ben Hutchings ]
+  * Really fix bugs in IPv6 forwarding with GRO/GSO (Closes: #630730):
+    - e1000e,igb,igbvf,ixgbe: Fix IPv6 GSO type checks
+    - ipv6: Add GSO support on forwarding path
+
  -- Ian Campbell <ijc at hellion.org.uk>  Sat, 15 Oct 2011 06:54:12 +0100
 
 linux-2.6 (2.6.32-38) stable; urgency=high

Modified: dists/squeeze/linux-2.6/debian/patches/bugfix/all/net-fix-ipv6-gso-type-checks-in-intel-ethernet-drivers.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/bugfix/all/net-fix-ipv6-gso-type-checks-in-intel-ethernet-drivers.patch	Wed Oct 19 19:05:00 2011	(r18172)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/net-fix-ipv6-gso-type-checks-in-intel-ethernet-drivers.patch	Sat Oct 22 00:07:42 2011	(r18173)
@@ -30,13 +30,13 @@
 +++ b/drivers/net/e1000e/netdev.c
 @@ -3807,7 +3807,7 @@ static int e1000_tso(struct e1000_adapte
  								 0);
- 			cmd_length = E1000_TXD_CMD_IP;
- 			ipcse = skb_transport_offset(skb) - 1;
--		} else if (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV6) {
-+		} else if (skb_is_gso_v6(skb)) {
- 			ipv6_hdr(skb)->payload_len = 0;
- 			tcp_hdr(skb)->check =
- 				~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
+ 		cmd_length = E1000_TXD_CMD_IP;
+ 		ipcse = skb_transport_offset(skb) - 1;
+-	} else if (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV6) {
++	} else if (skb_is_gso_v6(skb)) {
+ 		ipv6_hdr(skb)->payload_len = 0;
+ 		tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
+ 		                                       &ipv6_hdr(skb)->daddr,
 --- a/drivers/net/igb/igb_main.c
 +++ b/drivers/net/igb/igb_main.c
 @@ -3032,7 +3032,7 @@ static inline int igb_tso_adv(struct igb

Modified: dists/squeeze/linux-2.6/debian/patches/series/39
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/39	Wed Oct 19 19:05:00 2011	(r18172)
+++ dists/squeeze/linux-2.6/debian/patches/series/39	Sat Oct 22 00:07:42 2011	(r18173)
@@ -1 +1,3 @@
-+ bugfix/all/revert-xen-use-IRQF_FORCE_RESUME.patch
\ No newline at end of file
++ bugfix/all/revert-xen-use-IRQF_FORCE_RESUME.patch
++ bugfix/all/net-fix-ipv6-gso-type-checks-in-intel-ethernet-drivers.patch
++ bugfix/all/ipv6-add-gso-support-on-forwarding-path.patch