From 21fab7ebfec1feec5b26c47267601ef025b044dd Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 27 Oct 2010 20:54:34 +0200 Subject: [PATCH] compat-wireless: fix regression: The ifdef was accidentally removed in bb0324638d7301b8f87dfbee63b9633a8150cebc, add it again. Signed-off-by: Hauke Mehrtens --- patches/04-netns.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/patches/04-netns.patch b/patches/04-netns.patch index 2e17bc2ca18c..fbd9164a28a2 100644 --- a/patches/04-netns.patch +++ b/patches/04-netns.patch @@ -4,6 +4,18 @@ for the other changes. It'd be nice to figure out a way to bring thise here cleanly and seprately but they touch the same files... +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -3904,7 +3904,9 @@ static int nl80211_wiphy_netns(struct sk + if (!net_eq(wiphy_net(&rdev->wiphy), net)) + err = cfg80211_switch_netns(rdev, net); + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) + put_net(net); ++#endif + return err; + } + --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -224,6 +224,7 @@ int cfg80211_dev_rename(struct cfg80211_ -- 2.30.2