rename madwifi patch to madwifi-ng

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2287 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/wpa_supplicant/patches/103-madwifi-ng.patch b/openwrt/package/wpa_supplicant/patches/103-madwifi-ng.patch
new file mode 100644 (file)
index 0000000..3a3119f
--- /dev/null
+++ b/openwrt/package/wpa_supplicant/patches/103-madwifi-ng.patch
@@ -0,0 +1,50 @@
+diff -ruN wpa_supplicant-0.4.5-old/driver_madwifi.c wpa_supplicant-0.4.5-new/driver_madwifi.c
+--- wpa_supplicant-0.4.5-old/driver_madwifi.c  2005-09-17 07:36:33.000000000 +0200
++++ wpa_supplicant-0.4.5-new/driver_madwifi.c  2005-10-23 14:08:45.000000000 +0200
+@@ -27,11 +27,19 @@
+ #include "wpa_supplicant.h"
+ #include "wpa.h"
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <linux/types.h>
++#include <linux/socket.h>
++#include <linux/if.h>
++#include <stdint.h>
++#include <linux/if_packet.h>
++#include <linux/netlink.h>
++#include <linux/rtnetlink.h>
++
+ #include <include/compat.h>
+ #include <net80211/ieee80211.h>
+ #ifdef WME_NUM_AC
+-/* Assume this is built against BSD branch of madwifi driver. */
+-#define MADWIFI_BSD
+ #include <net80211/_ieee80211.h>
+ #endif /* WME_NUM_AC */
+ #include <net80211/ieee80211_crypto.h>
+@@ -78,19 +86,19 @@
+                               "ioctl[IEEE80211_IOCTL_SETKEY]",
+                               "ioctl[IEEE80211_IOCTL_GETKEY]",
+                               "ioctl[IEEE80211_IOCTL_DELKEY]",
+-                              NULL,
++                              "ioctl[IEEE80211_IOCTL_SETWMMPARAMS]",
+                               "ioctl[IEEE80211_IOCTL_SETMLME]",
+-                              NULL,
++                              "ioctl[IEEE80211_IOCTL_GETCHANINFO]",
+                               "ioctl[IEEE80211_IOCTL_SETOPTIE]",
+                               "ioctl[IEEE80211_IOCTL_GETOPTIE]",
+                               "ioctl[IEEE80211_IOCTL_ADDMAC]",
+                               NULL,
+                               "ioctl[IEEE80211_IOCTL_DELMAC]",
+-                              NULL,
+-                              "ioctl[IEEE80211_IOCTL_CHANLIST]",
++                              "ioctl[IEEE80211_IOCTL_GETCHANLIST]",
++                              "ioctl[IEEE80211_IOCTL_SETCHANLIST]",
+                       };
+                       if (IEEE80211_IOCTL_SETPARAM <= op &&
+-                          op <= IEEE80211_IOCTL_CHANLIST)
++                          op <= IEEE80211_IOCTL_SETCHANLIST)
+                               perror(opnames[op - SIOCIWFIRSTPRIV]);
+                       else
+                               perror("ioctl[unknown???]");

diff --git a/openwrt/package/wpa_supplicant/patches/103-madwifi.patch b/openwrt/package/wpa_supplicant/patches/103-madwifi.patch
deleted file mode 100644 (file)
index 3a3119f..0000000
--- a/openwrt/package/wpa_supplicant/patches/103-madwifi.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ruN wpa_supplicant-0.4.5-old/driver_madwifi.c wpa_supplicant-0.4.5-new/driver_madwifi.c
---- wpa_supplicant-0.4.5-old/driver_madwifi.c  2005-09-17 07:36:33.000000000 +0200
-+++ wpa_supplicant-0.4.5-new/driver_madwifi.c  2005-10-23 14:08:45.000000000 +0200
-@@ -27,11 +27,19 @@
- #include "wpa_supplicant.h"
- #include "wpa.h"
- 
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <linux/types.h>
-+#include <linux/socket.h>
-+#include <linux/if.h>
-+#include <stdint.h>
-+#include <linux/if_packet.h>
-+#include <linux/netlink.h>
-+#include <linux/rtnetlink.h>
-+
- #include <include/compat.h>
- #include <net80211/ieee80211.h>
- #ifdef WME_NUM_AC
--/* Assume this is built against BSD branch of madwifi driver. */
--#define MADWIFI_BSD
- #include <net80211/_ieee80211.h>
- #endif /* WME_NUM_AC */
- #include <net80211/ieee80211_crypto.h>
-@@ -78,19 +86,19 @@
-                               "ioctl[IEEE80211_IOCTL_SETKEY]",
-                               "ioctl[IEEE80211_IOCTL_GETKEY]",
-                               "ioctl[IEEE80211_IOCTL_DELKEY]",
--                              NULL,
-+                              "ioctl[IEEE80211_IOCTL_SETWMMPARAMS]",
-                               "ioctl[IEEE80211_IOCTL_SETMLME]",
--                              NULL,
-+                              "ioctl[IEEE80211_IOCTL_GETCHANINFO]",
-                               "ioctl[IEEE80211_IOCTL_SETOPTIE]",
-                               "ioctl[IEEE80211_IOCTL_GETOPTIE]",
-                               "ioctl[IEEE80211_IOCTL_ADDMAC]",
-                               NULL,
-                               "ioctl[IEEE80211_IOCTL_DELMAC]",
--                              NULL,
--                              "ioctl[IEEE80211_IOCTL_CHANLIST]",
-+                              "ioctl[IEEE80211_IOCTL_GETCHANLIST]",
-+                              "ioctl[IEEE80211_IOCTL_SETCHANLIST]",
-                       };
-                       if (IEEE80211_IOCTL_SETPARAM <= op &&
--                          op <= IEEE80211_IOCTL_CHANLIST)
-+                          op <= IEEE80211_IOCTL_SETCHANLIST)
-                               perror(opnames[op - SIOCIWFIRSTPRIV]);
-                       else
-                               perror("ioctl[unknown???]");