From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 19 Feb 2010 00:47:28 +0000 (+0000)
Subject: mac80211: move the 2.6.30 compat patch to the other compat patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b3caca36778acd3230a94c8e91f206c09f8cc442;p=openwrt%2Fstaging%2Faparcar.git

mac80211: move the 2.6.30 compat patch to the other compat patches

SVN-Revision: 19715
---

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 0000000000..de46545116
--- /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 de46545116..0000000000
--- 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;