From 2510ee90033ff94586d4d743f36a800f5ec0d08c Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 12 Mar 2013 18:06:55 -0700 Subject: [PATCH] compat-drivers: fix 0006-disable-dump-adjust-on-old-kernels.patch nl80211_dump_wiphy() got some huge updates throwing off the hunks completley. This required some manual updates. Signed-off-by: Luis R. Rodriguez --- ...6-disable-dump-adjust-on-old-kernels.patch | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch b/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch index aff39799ed4d..ff7abf757843 100644 --- a/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch +++ b/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch @@ -28,19 +28,19 @@ Date: Fri Mar 1 14:03:49 2013 +0100 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -1321,6 +1321,7 @@ static int nl80211_dump_wiphy(struct sk_ - cb->nlh->nlmsg_seq, NLM_F_MULTI, - dev); - if (ret < 0) { +@@ -1600,6 +1600,7 @@ static int nl80211_dump_wiphy(struct sk_ + &cb->args[2], + &cb->args[3]); + if (ret < 0) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) - /* - * If sending the wiphy data didn't fit (ENOBUFS or - * EMSGSIZE returned), this SKB is still empty (so -@@ -1340,6 +1341,7 @@ static int nl80211_dump_wiphy(struct sk_ - mutex_unlock(&cfg80211_mutex); - return 1; - } + /* + * If sending the wiphy data didn't fit (ENOBUFS + * or EMSGSIZE returned), this SKB is still +@@ -1620,6 +1621,7 @@ static int nl80211_dump_wiphy(struct sk_ + mutex_unlock(&cfg80211_mutex); + return 1; + } +#endif - idx--; - break; - } + idx--; + break; + } -- 2.30.2