Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26: (1090 commits)
  [NET]: Fix and allocate less memory for ->priv'less netdevices
  [IPV6]: Fix dangling references on error in fib6_add().
  [NETLABEL]: Fix NULL deref in netlbl_unlabel_staticlist_gen() if ifindex not found
  [PKT_SCHED]: Fix datalen check in tcf_simp_init().
  [INET]: Uninline the __inet_inherit_port call.
  [INET]: Drop the inet_inherit_port() call.
  SCTP: Initialize partial_bytes_acked to 0, when all of the data is acked.
  [netdrvr] forcedeth: internal simplifications; changelog removal
  phylib: factor out get_phy_id from within get_phy_device
  PHY: add BCM5464 support to broadcom PHY driver
  cxgb3: Fix __must_check warning with dev_dbg.
  tc35815: Statistics cleanup
  natsemi: fix MMIO for PPC 44x platforms
  [TIPC]: Cleanup of TIPC reference table code
  [TIPC]: Optimized initialization of TIPC reference table
  [TIPC]: Remove inlining of reference table locking routines
  e1000: convert uint16_t style integers to u16
  ixgb: convert uint16_t style integers to u16
  sb1000.c: make const arrays static
  sb1000.c: stop inlining largish static functions
  ...

1 files changed, 35 insertions, 0 deletions

diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index f577c8f1c66d..f27d11ab418b 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -97,6 +97,7 @@
 #define IEEE80211_MAX_FRAME_LEN         2352
 
 #define IEEE80211_MAX_SSID_LEN          32
+#define IEEE80211_MAX_MESH_ID_LEN       32
 
 struct ieee80211_hdr {
         __le16 frame_control;
@@ -109,6 +110,16 @@ struct ieee80211_hdr {
 } __attribute__ ((packed));
 
 
+struct ieee80211s_hdr {
+        u8 flags;
+        u8 ttl;
+        u8 seqnum[3];
+        u8 eaddr1[6];
+        u8 eaddr2[6];
+        u8 eaddr3[6];
+} __attribute__ ((packed));
+
+
 struct ieee80211_mgmt {
         __le16 frame_control;
         __le16 duration;
@@ -206,6 +217,23 @@ struct ieee80211_mgmt {
                                         __le16 params;
                                         __le16 reason_code;
                                 } __attribute__((packed)) delba;
+                                struct{
+                                        u8 action_code;
+                                        /* capab_info for open and confirm,
+                                         * reason for close
+                                         */
+                                        __le16 aux;
+                                        /* Followed in plink_confirm by status
+                                         * code, AID and supported rates,
+                                         * and directly by supported rates in
+                                         * plink_open and plink_close
+                                         */
+                                        u8 variable[0];
+                                } __attribute__((packed)) plink_action;
+                                struct{
+                                        u8 action_code;
+                                        u8 variable[0];
+                                } __attribute__((packed)) mesh_action;
                         } u;
                 } __attribute__ ((packed)) action;
         } u;
@@ -437,6 +465,13 @@ enum ieee80211_eid {
         WLAN_EID_TS_DELAY = 43,
         WLAN_EID_TCLAS_PROCESSING = 44,
         WLAN_EID_QOS_CAPA = 46,
+        /* 802.11s */
+        WLAN_EID_MESH_CONFIG = 36,      /* Pending IEEE 802.11 ANA approval */
+        WLAN_EID_MESH_ID = 37,          /* Pending IEEE 802.11 ANA approval */
+        WLAN_EID_PEER_LINK = 40,        /* Pending IEEE 802.11 ANA approval */
+        WLAN_EID_PREQ = 53,             /* Pending IEEE 802.11 ANA approval */
+        WLAN_EID_PREP = 54,             /* Pending IEEE 802.11 ANA approval */
+        WLAN_EID_PERR = 55,             /* Pending IEEE 802.11 ANA approval */
         /* 802.11h */
         WLAN_EID_PWR_CONSTRAINT = 32,
         WLAN_EID_PWR_CAPABILITY = 33,