[kernel] r8042 - in dists/sid/linux-2.6/debian: . patches/bugfix patches/series

[maximilian attems]

Author: maks-guest
Date: Thu Dec 28 22:43:28 2006
New Revision: 8042

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/2.6.16.34
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/9
Log:
add open 2.6.16.34 fixes


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Thu Dec 28 22:43:28 2006
@@ -45,7 +45,12 @@
   * m68k/atari: enable keyboard, mouse and fb drivers
   * m68k/atari: fixes for ethernec and video driver by Michael Schmitz
 
- -- dann frazier <dannf at debian.org>  Sun, 24 Dec 2006 11:11:31 -0700
+  [ maximilian attems ]
+  * Hand-picked from stable release 2.6.16.34:
+    - [IPX]: Annotate and fix IPX checksum
+    - [IGMP]: Fix IGMPV3_EXP() normalization bit shift value.
+
+ -- maximilian attems <maks at sternwelten.at>  Thu, 28 Dec 2006 22:38:00 +0100
 
 linux-2.6 (2.6.18-8) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/2.6.16.34
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/2.6.16.34	Thu Dec 28 22:43:28 2006
@@ -0,0 +1,28 @@
+diff --git a/include/linux/igmp.h b/include/linux/igmp.h
+index 28f4f3b..c8bccd0 100644
+--- a/include/linux/igmp.h
++++ b/include/linux/igmp.h
+@@ -191,7 +191,7 @@ struct ip_mc_list
+ #define IGMPV3_MASK(value, nb) ((nb)>=32 ? (value) : ((1<<(nb))-1) & (value))
+ #define IGMPV3_EXP(thresh, nbmant, nbexp, value) \
+ 	((value) < (thresh) ? (value) : \
+-        ((IGMPV3_MASK(value, nbmant) | (1<<(nbmant+nbexp))) << \
++        ((IGMPV3_MASK(value, nbmant) | (1<<(nbmant))) << \
+          (IGMPV3_MASK((value) >> (nbmant), nbexp) + (nbexp))))
+ 
+ #define IGMPV3_QQIC(value) IGMPV3_EXP(0x80, 4, 3, value)
+diff --git a/include/net/ipx.h b/include/net/ipx.h
+index 5c0cf33..0447b3c 100644
+--- a/include/net/ipx.h
++++ b/include/net/ipx.h
+@@ -26,8 +26,8 @@ struct ipx_address {
+ #define IPX_MAX_PPROP_HOPS 8
+ 
+ struct ipxhdr {
+-	__u16			ipx_checksum __attribute__ ((packed));
+-#define IPX_NO_CHECKSUM	0xFFFF
++	__be16			ipx_checksum __attribute__ ((packed));
++#define IPX_NO_CHECKSUM	__constant_htons(0xFFFF)
+ 	__u16			ipx_pktsize __attribute__ ((packed));
+ 	__u8			ipx_tctrl;
+ 	__u8			ipx_type;

Modified: dists/sid/linux-2.6/debian/patches/series/9
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/9	(original)
+++ dists/sid/linux-2.6/debian/patches/series/9	Thu Dec 28 22:43:28 2006
@@ -16,3 +16,4 @@
 + bugfix/mincore-hang.patch
 + bugfix/mincore-error-value-cases.patch
 + bugfix/mincore-typo.patch
++ bugfix/2.6.16.34