[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.23 / 210-mac80211_include_wireless_dev.patch

diff --git a/target/linux/generic-2.6/patches-2.6.23/210-mac80211_include_wireless_dev.patch b/target/linux/generic-2.6/patches-2.6.23/210-mac80211_include_wireless_dev.patch
index 6db9d7e..b8fbbe9 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.23/210-mac80211_include_wireless_dev.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/210-mac80211_include_wireless_dev.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.23.17/include/linux/ieee80211.h
-===================================================================
---- linux-2.6.23.17.orig/include/linux/ieee80211.h
-+++ linux-2.6.23.17/include/linux/ieee80211.h
+--- a/include/linux/ieee80211.h
++++ b/include/linux/ieee80211.h

 @@ -106,6 +106,75 @@ struct ieee80211_hdr {
  } __attribute__ ((packed));
  
 @@ -106,6 +106,75 @@ struct ieee80211_hdr {
  } __attribute__ ((packed));
  


@@ -300,10 +298,8 @@ Index: linux-2.6.23.17/include/linux/ieee80211.h
 +};
 +
  #endif /* IEEE80211_H */
 +};
 +
  #endif /* IEEE80211_H */

-Index: linux-2.6.23.17/include/linux/nl80211.h
-===================================================================
---- linux-2.6.23.17.orig/include/linux/nl80211.h
-+++ linux-2.6.23.17/include/linux/nl80211.h
+--- a/include/linux/nl80211.h
++++ b/include/linux/nl80211.h

 @@ -7,6 +7,217 @@
   */
  
 @@ -7,6 +7,217 @@
   */
  


@@ -579,10 +575,8 @@ Index: linux-2.6.23.17/include/linux/nl80211.h
 +#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1)
 +
  #endif /* __LINUX_NL80211_H */
 +#define NL80211_KEYTYPE_MAX (__NL80211_KEYTYPE_AFTER_LAST - 1)
 +
  #endif /* __LINUX_NL80211_H */

-Index: linux-2.6.23.17/include/net/cfg80211.h
-===================================================================
---- linux-2.6.23.17.orig/include/net/cfg80211.h
-+++ linux-2.6.23.17/include/net/cfg80211.h
+--- a/include/net/cfg80211.h
++++ b/include/net/cfg80211.h

 @@ -3,6 +3,7 @@
  
  #include <linux/netlink.h>
 @@ -3,6 +3,7 @@
  
  #include <linux/netlink.h>


@@ -725,10 +719,8 @@ Index: linux-2.6.23.17/include/net/cfg80211.h
 +                          u32 seq, int flags, u8 cmd);
 +
  #endif /* __NET_CFG80211_H */
 +                          u32 seq, int flags, u8 cmd);
 +
  #endif /* __NET_CFG80211_H */

-Index: linux-2.6.23.17/include/net/iw_handler.h
-===================================================================
---- linux-2.6.23.17.orig/include/net/iw_handler.h
-+++ linux-2.6.23.17/include/net/iw_handler.h
+--- a/include/net/iw_handler.h
++++ b/include/net/iw_handler.h

 @@ -431,7 +431,13 @@ struct iw_public_data {
   * Those may be called only within the kernel.
   */
 @@ -431,7 +431,13 @@ struct iw_public_data {
   * Those may be called only within the kernel.
   */


@@ -744,10 +736,8 @@ Index: linux-2.6.23.17/include/net/iw_handler.h
  
  /* Send a single event to user space */
  extern void wireless_send_event(struct net_device *   dev,
  
  /* Send a single event to user space */
  extern void wireless_send_event(struct net_device *   dev,

-Index: linux-2.6.23.17/include/net/mac80211.h
-===================================================================
---- linux-2.6.23.17.orig/include/net/mac80211.h
-+++ linux-2.6.23.17/include/net/mac80211.h
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h

 @@ -300,7 +300,6 @@ struct ieee80211_conf {
        /* Following five fields are used for IEEE 802.11H */
        unsigned int radar_detect;
 @@ -300,7 +300,6 @@ struct ieee80211_conf {
        /* Following five fields are used for IEEE 802.11H */
        unsigned int radar_detect;