refresh generic 2.6.23 patches in upstream style

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

1 files changed, 28 insertions, 38 deletions

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 6db9d7e7a..cca0c0b84 100644
--- 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,8 +1,6 @@
-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
-@@ -106,6 +106,75 @@ struct ieee80211_hdr {
+--- a/include/linux/ieee80211.h
++++ b/include/linux/ieee80211.h
+@@ -106,6 +106,75 @@
  } __attribute__ ((packed));
  
  
@@ -78,7 +76,7 @@ Index: linux-2.6.23.17/include/linux/ieee80211.h
  struct ieee80211_mgmt {
  	__le16 frame_control;
  	__le16 duration;
-@@ -173,9 +242,51 @@ struct ieee80211_mgmt {
+@@ -173,9 +242,51 @@
  				struct {
  					u8 action_code;
  					u8 dialog_token;
@@ -130,7 +128,7 @@ Index: linux-2.6.23.17/include/linux/ieee80211.h
  				struct{
  					u8 action_code;
  					u8 element_id;
-@@ -184,6 +295,25 @@ struct ieee80211_mgmt {
+@@ -184,6 +295,25 @@
  					u8 new_chan;
  					u8 switch_count;
  				} __attribute__((packed)) chan_switch;
@@ -156,7 +154,7 @@ Index: linux-2.6.23.17/include/linux/ieee80211.h
  			} u;
  		} __attribute__ ((packed)) action;
  	} u;
-@@ -270,6 +400,18 @@ enum ieee80211_statuscode {
+@@ -270,6 +400,18 @@
  	WLAN_STATUS_UNSUPP_RSN_VERSION = 44,
  	WLAN_STATUS_INVALID_RSN_IE_CAP = 45,
  	WLAN_STATUS_CIPHER_SUITE_REJECTED = 46,
@@ -175,7 +173,7 @@ Index: linux-2.6.23.17/include/linux/ieee80211.h
  };
  
  
-@@ -300,9 +442,50 @@ enum ieee80211_reasoncode {
+@@ -300,9 +442,50 @@
  	WLAN_REASON_INVALID_RSN_IE_CAP = 22,
  	WLAN_REASON_IEEE8021X_FAILED = 23,
  	WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
@@ -226,7 +224,7 @@ Index: linux-2.6.23.17/include/linux/ieee80211.h
  /* Information Element IDs */
  enum ieee80211_eid {
  	WLAN_EID_SSID = 0,
-@@ -318,6 +501,15 @@ enum ieee80211_eid {
+@@ -318,6 +501,15 @@
  	WLAN_EID_HP_PARAMS = 8,
  	WLAN_EID_HP_TABLE = 9,
  	WLAN_EID_REQUEST = 10,
@@ -242,7 +240,7 @@ Index: linux-2.6.23.17/include/linux/ieee80211.h
  	/* 802.11h */
  	WLAN_EID_PWR_CONSTRAINT = 32,
  	WLAN_EID_PWR_CAPABILITY = 33,
-@@ -332,6 +524,9 @@ enum ieee80211_eid {
+@@ -332,6 +524,9 @@
  	/* 802.11g */
  	WLAN_EID_ERP_INFO = 42,
  	WLAN_EID_EXT_SUPP_RATES = 50,
@@ -252,7 +250,7 @@ Index: linux-2.6.23.17/include/linux/ieee80211.h
  	/* 802.11i */
  	WLAN_EID_RSN = 48,
  	WLAN_EID_WPA = 221,
-@@ -340,6 +535,9 @@ enum ieee80211_eid {
+@@ -340,6 +535,9 @@
  	WLAN_EID_QOS_PARAMETER = 222
  };
  
@@ -262,7 +260,7 @@ Index: linux-2.6.23.17/include/linux/ieee80211.h
  /* cipher suite selectors */
  #define WLAN_CIPHER_SUITE_USE_GROUP	0x000FAC00
  #define WLAN_CIPHER_SUITE_WEP40		0x000FAC01
-@@ -350,4 +548,37 @@ enum ieee80211_eid {
+@@ -350,4 +548,37 @@
  
  #define WLAN_MAX_KEY_LEN		32
  
@@ -300,10 +298,8 @@ Index: linux-2.6.23.17/include/linux/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 @@
   */
  
@@ -522,7 +518,7 @@ Index: linux-2.6.23.17/include/linux/nl80211.h
   * enum nl80211_iftype - (virtual) interface types
   * @NL80211_IFTYPE_UNSPECIFIED: unspecified type, driver decides
   * @NL80211_IFTYPE_ADHOC: independent BSS member
-@@ -35,4 +246,56 @@ enum nl80211_iftype {
+@@ -35,4 +246,56 @@
  };
  #define NL80211_IFTYPE_MAX (__NL80211_IFTYPE_AFTER_LAST - 1)
  
@@ -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 */
-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>
@@ -591,7 +585,7 @@ Index: linux-2.6.23.17/include/net/cfg80211.h
  #include <net/genetlink.h>
  
  /*
-@@ -49,6 +50,69 @@ extern int ieee80211_radiotap_iterator_n
+@@ -49,6 +50,69 @@
     struct ieee80211_radiotap_iterator *iterator);
  
  
@@ -661,7 +655,7 @@ Index: linux-2.6.23.17/include/net/cfg80211.h
  /* from net/wireless.h */
  struct wiphy;
  
-@@ -68,11 +132,62 @@ struct wiphy;
+@@ -68,11 +132,62 @@
   * @add_virtual_intf: create a new virtual interface with the given name
   *
   * @del_virtual_intf: remove the virtual interface determined by ifindex.
@@ -725,11 +719,9 @@ Index: linux-2.6.23.17/include/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
-@@ -431,7 +431,13 @@ struct iw_public_data {
+--- a/include/net/iw_handler.h
++++ b/include/net/iw_handler.h
+@@ -431,7 +431,13 @@
   * Those may be called only within the kernel.
   */
  
@@ -744,11 +736,9 @@ 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,
-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
-@@ -300,7 +300,6 @@ struct ieee80211_conf {
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -300,7 +300,6 @@
  	/* Following five fields are used for IEEE 802.11H */
  	unsigned int radar_detect;
  	unsigned int spect_mgmt;
@@ -756,7 +746,7 @@ Index: linux-2.6.23.17/include/net/mac80211.h
  	unsigned int quiet_duration; /* duration of quiet period */
  	unsigned int quiet_offset; /* how far into the beacon is the quiet
  				    * period */
-@@ -521,6 +520,9 @@ struct ieee80211_hw {
+@@ -521,6 +520,9 @@
  	 * per-packet RC4 key with each TX frame when doing hwcrypto */
  #define IEEE80211_HW_TKIP_REQ_PHASE2_KEY (1<<14)
  
@@ -766,7 +756,7 @@ Index: linux-2.6.23.17/include/net/mac80211.h
  	u32 flags;			/* hardware flags defined above */
  
  	/* Set to the size of a needed device specific skb headroom for TX skbs. */
-@@ -649,8 +651,7 @@ struct ieee80211_ops {
+@@ -649,8 +651,7 @@
  	 * used if the wlan hardware or low-level driver implements PAE.
  	 * 80211.o module will anyway filter frames based on authorization
  	 * state, so this function pointer can be NULL if low-level driver does
@@ -776,7 +766,7 @@ Index: linux-2.6.23.17/include/net/mac80211.h
  	int (*set_port_auth)(struct ieee80211_hw *hw, u8 *addr,
  			     int authorized);
  
-@@ -702,8 +703,9 @@ struct ieee80211_ops {
+@@ -702,8 +703,9 @@
  	/* Get statistics of the current TX queue status. This is used to get
  	 * number of currently queued packets (queue length), maximum queue
  	 * size (limit), and total number of packets sent using each TX queue
@@ -788,7 +778,7 @@ Index: linux-2.6.23.17/include/net/mac80211.h
  	int (*get_tx_stats)(struct ieee80211_hw *hw,
  			    struct ieee80211_tx_queue_stats *stats);
  
-@@ -713,12 +715,25 @@ struct ieee80211_ops {
+@@ -713,12 +715,25 @@
  	 * Must be atomic. */
  	u64 (*get_tsf)(struct ieee80211_hw *hw);