[kernel] r18019 - in dists/squeeze/linux-2.6/debian/patches: debian series

[Ben Hutchings]

Author: benh
Date: Sat Aug 27 05:31:02 2011
New Revision: 18019

Log:
if_packet: Avoid ABI change in 2.6.32.43

Added:
   dists/squeeze/linux-2.6/debian/patches/debian/if_packet-avoid-ABI-change-in-2.6.32.43.patch
Modified:
   dists/squeeze/linux-2.6/debian/patches/series/36

Added: dists/squeeze/linux-2.6/debian/patches/debian/if_packet-avoid-ABI-change-in-2.6.32.43.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/debian/if_packet-avoid-ABI-change-in-2.6.32.43.patch	Sat Aug 27 05:31:02 2011	(r18019)
@@ -0,0 +1,29 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: if_packet: Avoid ABI change in 2.6.32.43
+
+A change in 2.6.32.43 replaces 2 bytes of automatic padding for
+alignment with a named field, in 2 structures.  The changes are
+binary-compatible, so just hide them from genksysms.
+
+--- a/include/linux/if_packet.h
++++ b/include/linux/if_packet.h
+@@ -63,7 +63,9 @@
+ 	__u16		tp_mac;
+ 	__u16		tp_net;
+ 	__u16		tp_vlan_tci;
++#ifndef __GENKSYMS__
+ 	__u16		tp_padding;
++#endif
+ };
+ 
+ /* Rx ring - header status */
+@@ -104,7 +106,9 @@
+ 	__u32		tp_sec;
+ 	__u32		tp_nsec;
+ 	__u16		tp_vlan_tci;
++#ifndef __GENKSYMS__
+ 	__u16		tp_padding;
++#endif
+ };
+ 
+ #define TPACKET2_HDRLEN		(TPACKET_ALIGN(sizeof(struct tpacket2_hdr)) + sizeof(struct sockaddr_ll))

Modified: dists/squeeze/linux-2.6/debian/patches/series/36
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/36	Sat Aug 27 05:13:30 2011	(r18018)
+++ dists/squeeze/linux-2.6/debian/patches/series/36	Sat Aug 27 05:31:02 2011	(r18019)
@@ -19,6 +19,7 @@
 + bugfix/all/drm-radeon-kms-fix-for-radeon-on-systems-4GB-without.patch
 - bugfix/all/taskstats-don-t-allow-duplicate-entries-in-listener-mode.patch
 + bugfix/all/stable/2.6.32.43.patch
++ debian/if_packet-avoid-ABI-change-in-2.6.32.43.patch
 
 # Networking
 + features/all/net-Add-netdev_alloc_skb_ip_align-helper.patch