compat-drivers: rename disable-dump-adjust-on-old-kernels.patch
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>
Thu, 7 Mar 2013 22:17:25 +0000 (14:17 -0800)
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>
Thu, 7 Mar 2013 22:17:25 +0000 (14:17 -0800)
Rename this from:

70-disable-dump-adjust-on-old-kernels.patch

to:

0006-disable-dump-adjust-on-old-kernels.patch

4 digit patches are patches which have undergone review for
breaking it down as much as possible to help with seeing if
some of these can later be expressed as SmPL grammer for usage
with Coccinelle.

At this point SmPL grammer is possible for 0001-netdev_ops.patch
but that is because we have all the other 2 digit patches yet to
break down further.

This patch submitted by Johannes is already well broken down
so rename it to annotate it has been reviewed and is as atomic
as can be.

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch [new file with mode: 0644]
patches/collateral-evolutions/network/70-disable-dump-adjust-on-old-kernels.patch [deleted file]

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
new file mode 100644 (file)
index 0000000..a1c1250
--- /dev/null
@@ -0,0 +1,21 @@
+On older kernels, we can't do this workaround, so if you use
+an old 64-bit kernel with compat you'd better upgrade.
+
+--- 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) {
++#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;
+                       }
++#endif
+                       idx--;
+                       break;
+               }
diff --git a/patches/collateral-evolutions/network/70-disable-dump-adjust-on-old-kernels.patch b/patches/collateral-evolutions/network/70-disable-dump-adjust-on-old-kernels.patch
deleted file mode 100644 (file)
index a1c1250..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-On older kernels, we can't do this workaround, so if you use
-an old 64-bit kernel with compat you'd better upgrade.
-
---- 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) {
-+#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;
-                       }
-+#endif
-                       idx--;
-                       break;
-               }