From 766119e588aeb0a75b6924fc99bd04f93713a2b2 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 4 Aug 2009 13:04:16 -0700 Subject: [PATCH] Move netns hunk to its own 05-netns.patch There is another netns related change on 01-netdev.patch but haven't figured out a way to split by having them not touch the same files. While we could have the netdev stuff apply first and then afterwards apply the netns stuff to the same files maintaining that would be quite painful so for now lets leave this as is. Signed-off-by: Luis R. Rodriguez --- compat/compat.diff | 12 ------------ compat/diffs/05-netns.patch | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 compat/diffs/05-netns.patch diff --git a/compat/compat.diff b/compat/compat.diff index d0096b404fa2..5e08e870beaa 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -262,15 +262,3 @@ - zd_chip_control_leds(&mac->chip, LED_OFF); + zd_chip_control_leds(&mac->chip, ZD_LED_OFF); } ---- a/net/wireless/nl80211.c 2009-07-27 16:22:30.301045695 -0700 -+++ b/net/wireless/nl80211.c 2009-07-27 18:17:28.445046102 -0700 -@@ -29,7 +29,9 @@ - .hdrsize = 0, /* no private header */ - .version = 1, /* no particular meaning now */ - .maxattr = NL80211_ATTR_MAX, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) - .netnsok = true, -+#endif - }; - - /* internal helper: get rdev and dev */ diff --git a/compat/diffs/05-netns.patch b/compat/diffs/05-netns.patch new file mode 100644 index 000000000000..65778d88e4b5 --- /dev/null +++ b/compat/diffs/05-netns.patch @@ -0,0 +1,12 @@ +--- a/net/wireless/nl80211.c 2009-07-27 16:22:30.301045695 -0700 ++++ b/net/wireless/nl80211.c 2009-07-27 18:17:28.445046102 -0700 +@@ -29,7 +29,9 @@ + .hdrsize = 0, /* no private header */ + .version = 1, /* no particular meaning now */ + .maxattr = NL80211_ATTR_MAX, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) + .netnsok = true, ++#endif + }; + + /* internal helper: get rdev and dev */ -- 2.30.2