From 13278fa5e8209be976640091026dc1beb7401517 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 19 Feb 2010 00:47:28 +0000 Subject: mac80211: move the 2.6.30 compat patch to the other compat patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19715 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/mac80211/patches/120-linux-2.6.30-compat.patch | 14 ++++++++++++++ package/mac80211/patches/900-linux-2.6.30-compat.patch | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 package/mac80211/patches/120-linux-2.6.30-compat.patch delete mode 100644 package/mac80211/patches/900-linux-2.6.30-compat.patch diff --git a/package/mac80211/patches/120-linux-2.6.30-compat.patch b/package/mac80211/patches/120-linux-2.6.30-compat.patch new file mode 100644 index 000000000..de4654511 --- /dev/null +++ b/package/mac80211/patches/120-linux-2.6.30-compat.patch @@ -0,0 +1,14 @@ +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -5667,7 +5667,11 @@ + return err; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) + err = genlmsg_unicast(wiphy_net(&rdev->wiphy), msg, nlpid); ++#else ++ err = genlmsg_unicast(msg, nlpid); ++#endif + if (err < 0) + return err; + return 0; diff --git a/package/mac80211/patches/900-linux-2.6.30-compat.patch b/package/mac80211/patches/900-linux-2.6.30-compat.patch deleted file mode 100644 index de4654511..000000000 --- a/package/mac80211/patches/900-linux-2.6.30-compat.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/net/wireless/nl80211.c -+++ b/net/wireless/nl80211.c -@@ -5667,7 +5667,11 @@ - return err; - } - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)) - err = genlmsg_unicast(wiphy_net(&rdev->wiphy), msg, nlpid); -+#else -+ err = genlmsg_unicast(msg, nlpid); -+#endif - if (err < 0) - return err; - return 0; -- cgit v1.2.3