From 3ede8e02ea893b3ac1b61933df11cba74dec3c73 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 22 Jun 2012 10:24:07 -0700 Subject: [PATCH] compat-wireless: refresh patches for next-20120622 Signed-off-by: Luis R. Rodriguez --- patches/04-netns.patch | 4 ++-- patches/55-iwlwifi-msg-trace-fix.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/04-netns.patch b/patches/04-netns.patch index dddbc68554ff..5b53fdca124c 100644 --- a/patches/04-netns.patch +++ b/patches/04-netns.patch @@ -104,7 +104,7 @@ files... module_exit(cfg80211_exit); --- a/net/wireless/wext-core.c +++ b/net/wireless/wext-core.c -@@ -366,6 +366,7 @@ static int __init wireless_nlevent_init( +@@ -367,6 +367,7 @@ static int __init wireless_nlevent_init( subsys_initcall(wireless_nlevent_init); /* Process events generated by the wireless layer or the driver. */ @@ -112,7 +112,7 @@ files... static void wireless_nlevent_process(struct work_struct *work) { struct sk_buff *skb; -@@ -381,6 +382,20 @@ static void wireless_nlevent_process(str +@@ -382,6 +383,20 @@ static void wireless_nlevent_process(str rtnl_unlock(); } diff --git a/patches/55-iwlwifi-msg-trace-fix.patch b/patches/55-iwlwifi-msg-trace-fix.patch index 1e8803faa51b..151454c24dac 100644 --- a/patches/55-iwlwifi-msg-trace-fix.patch +++ b/patches/55-iwlwifi-msg-trace-fix.patch @@ -5,7 +5,7 @@ the message is printed and traced. --- a/drivers/net/wireless/iwlwifi/iwl-debug.c +++ b/drivers/net/wireless/iwlwifi/iwl-debug.c -@@ -72,13 +72,16 @@ void __iwl_ ##fn(struct device *dev, const char *fmt, ...) \ +@@ -72,13 +72,16 @@ void __iwl_ ##fn(struct device *dev, con struct va_format vaf = { \ .fmt = fmt, \ }; \ @@ -26,7 +26,7 @@ the message is printed and traced. } __iwl_fn(warn) -@@ -97,13 +100,18 @@ void __iwl_err(struct device *dev, bool rfkill_prefix, bool trace_only, +@@ -97,13 +100,18 @@ void __iwl_err(struct device *dev, bool va_list args; va_start(args, fmt); -- 2.30.2