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

[Ben Hutchings]

Author: benh
Date: Sun Aug 28 11:45:26 2011
New Revision: 18025

Log:
bridge: Avoid ABI change in 2.6.32.44

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

Added: dists/squeeze/linux-2.6/debian/patches/debian/bridge-avoid-ABI-change-in-2.6.32.44.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/debian/bridge-avoid-ABI-change-in-2.6.32.44.patch	Sun Aug 28 11:45:26 2011	(r18025)
@@ -0,0 +1,21 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: bridge: Avoid ABI change in 2.6.32.44
+
+The change is in a private structure defined outside include/.  Hide
+the change from genksyms.
+
+diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
+index 8567d47..476b65b 100644
+--- a/net/bridge/br_private.h
++++ b/net/bridge/br_private.h
+@@ -75,7 +75,10 @@ struct net_bridge_port
+ 	bridge_id			designated_bridge;
+ 	u32				path_cost;
+ 	u32				designated_cost;
++	/* This structure is private; ignore changes */
++#ifndef __GENKSYMS__
+ 	unsigned long			designated_age;
++#endif
+ 
+ 	struct timer_list		forward_delay_timer;
+ 	struct timer_list		hold_timer;

Modified: dists/squeeze/linux-2.6/debian/patches/series/36
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/36	Sat Aug 27 14:19:53 2011	(r18024)
+++ dists/squeeze/linux-2.6/debian/patches/series/36	Sun Aug 28 11:45:26 2011	(r18025)
@@ -686,6 +686,7 @@
 + bugfix/all/stable/2.6.32.44.patch
 + bugfix/all/tunnels-fix-netns-vs-proto-registration-ordering-regression-fix.patch
 + bugfix/all/proc-fix-a-race-in-do_io_accounting.patch
++ debian/bridge-avoid-ABI-change-in-2.6.32.44.patch
 
 - bugfix/all/CVE-2011-3188.patch
 + bugfix/all/stable/2.6.32.45.patch