Ticket #517: iemanagement.diff

net80211/ieee80211_ioctl.h

@@ -471 +471 @@
-#define IEEE80211_IOC_DELMAC            55      /* del sta from MAC ACL table */
-#define IEEE80211_IOC_FF                56      /* ATH fast frames (on, off) */
-#define IEEE80211_IOC_TURBOP            57      /* ATH turbo' (on, off) */
+#define IEEE80211_IOC_APPIEBUF          58      /* IE in the management frame */
+#define IEEE80211_IOC_FILTERFRAME       59      /* management frame filter*/
-
-/*
- * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS.
@@ -514 +516 @@
-#define IEEE80211_IOCTL_SETCHANLIST     (SIOCIWFIRSTPRIV+6)
-#define IEEE80211_IOCTL_GETCHANLIST     (SIOCIWFIRSTPRIV+7)
-#define IEEE80211_IOCTL_CHANSWITCH      (SIOCIWFIRSTPRIV+8)
+#define IEEE80211_IOCTL_GET_APPIEBUF    (SIOCIWFIRSTPRIV+9)
+#define IEEE80211_IOCTL_SET_APPIEBUF    (SIOCIWFIRSTPRIV+10)
+#define IEEE80211_IOCTL_FILTERFRAME     (SIOCIWFIRSTPRIV+12)
-#define IEEE80211_IOCTL_GETCHANINFO     (SIOCIWFIRSTPRIV+13)
-#define IEEE80211_IOCTL_SETOPTIE        (SIOCIWFIRSTPRIV+14)
-#define IEEE80211_IOCTL_GETOPTIE        (SIOCIWFIRSTPRIV+15)
@@ -525 +530 @@
-#define IEEE80211_IOCTL_WDSADDMAC       (SIOCIWFIRSTPRIV+26)
-#define IEEE80211_IOCTL_WDSDELMAC       (SIOCIWFIRSTPRIV+28)
-#define IEEE80211_IOCTL_KICKMAC         (SIOCIWFIRSTPRIV+30)
+
-enum {
-        IEEE80211_WMMPARAMS_CWMIN       = 1,
-        IEEE80211_WMMPARAMS_CWMAX       = 2,
@@ -611 +617 @@
-#define IEEE80211_NO_STABEACONS 0x0002          /* Do not setup the station beacon timers */
-};
-
+/* added APPIEBUF related definations */
+enum{
+    IEEE80211_APPIE_FRAME_BEACON     = 0,
+    IEEE80211_APPIE_FRAME_PROBE_REQ  = 1,
+    IEEE80211_APPIE_FRAME_PROBE_RESP = 2,
+    IEEE80211_APPIE_FRAME_ASSOC_REQ  = 3,
+    IEEE80211_APPIE_FRAME_ASSOC_RESP = 4,
+    IEEE80211_APPIE_NUM_OF_FRAME     = 5
+};
+struct ieee80211req_getset_appiebuf {
+    u_int32_t app_frmtype; /*management frame type for which buffer is added*/
+    u_int32_t app_buflen;  /*application supplied buffer length */
+    u_int8_t  app_buf[];
+};
+
+/* the following definations are used by application to set filter
+ * for receiving management frames */
+enum {
+     IEEE80211_FILTER_TYPE_BEACON      =   0x1,
+     IEEE80211_FILTER_TYPE_PROBE_REQ   =   0x2,
+     IEEE80211_FILTER_TYPE_PROBE_RESP  =   0x4,
+     IEEE80211_FILTER_TYPE_ASSOC_REQ   =   0x8,
+     IEEE80211_FILTER_TYPE_ASSOC_RESP  =   0x10,
+     IEEE80211_FILTER_TYPE_AUTH        =   0x20,
+     IEEE80211_FILTER_TYPE_DEAUTH      =   0x40,
+     IEEE80211_FILTER_TYPE_DISASSOC    =   0x80,
+     IEEE80211_FILTER_TYPE_ALL         =   0xFF  /* used to check the valid filter bits */
+};
+
+struct ieee80211req_set_filter {
+      u_int32_t app_filterype; /* management frame filter type */
+};
+
+
-#endif /* __linux__ */
-
-#endif /* _NET80211_IEEE80211_IOCTL_H_ */

net80211/ieee80211_beacon.c

@@ -153 +153 @@
-        if (vap->iv_ath_cap & IEEE80211_ATHC_XR)        /* XR */
-                frm = ieee80211_add_xr_param(frm, vap);
-#endif
+        bo->bo_appie_buf = frm;
+        bo->bo_appie_buf_len = 0;
+
-        bo->bo_tim_trailerlen = frm - bo->bo_tim_trailer;
-        bo->bo_chanswitch_trailerlen = frm - bo->bo_chanswitch;
-
@@ -218 +221 @@
-                 + (ic->ic_ath_cap & IEEE80211_ATHC_XR ?        /* XR */
-                        sizeof(struct ieee80211_xr_param) : 0)
-#endif
+                 + IEEE80211_APPIE_MAX  /* APP_IE buffer */
-                 ;
-        skb = ieee80211_getmgtframe(&frm, pktlen);
-        if (skb == NULL) {
@@ -409 +413 @@
-                                bo->bo_erp += trailer_adjust;
-                                bo->bo_ath_caps += trailer_adjust;
-                                bo->bo_xr += trailer_adjust;
+                                bo->bo_appie_buf += trailer_adjust;
-                                if (timlen > bo->bo_tim_len)
-                                        skb_put(skb, timlen - bo->bo_tim_len);
-                                else
@@ -464 +469 @@
-                                bo->bo_erp += IEEE80211_CHANSWITCHANN_BYTES;
-                                bo->bo_ath_caps += IEEE80211_CHANSWITCHANN_BYTES;
-                                bo->bo_xr += IEEE80211_CHANSWITCHANN_BYTES;
+                                bo->bo_appie_buf += IEEE80211_CHANSWITCHANN_BYTES;
-
-                                /* indicate new beacon length so other layers may manage memory */
-                                skb_put(skb, IEEE80211_CHANSWITCHANN_BYTES);
@@ -493 +499 @@
-            IEEE80211_IS_CHAN_TURBO(ic->ic_curchan))
-                ieee80211_add_athAdvCap(bo->bo_ath_caps, vap->iv_bss->ni_ath_flags,
-                        vap->iv_bss->ni_ath_defkeyindex);
+        /* add APP_IE buffer if app updated it */
+        if (vap->iv_flags_ext & IEEE80211_FEXT_APPIE_UPDATE) {
+        /* adjust the buffer size if the size is changed */
+                if(vap->app_ie[IEEE80211_APPIE_FRAME_BEACON].length != bo-> bo_appie_buf_len) {
+                        int diff_len;
+                        diff_len = vap->app_ie[IEEE80211_APPIE_FRAME_BEACON].length - bo-> bo_appie_buf_len;
+        
+                        if(diff_len > 0)
+                                skb_put(skb,diff_len);
+                        else
+                                skb_trim(skb,skb->len + diff_len);
+
+                        bo->bo_appie_buf_len = vap->app_ie[IEEE80211_APPIE_FRAME_BEACON].length;
+                        /* update the trailer lens */
+                        bo->bo_chanswitch_trailerlen += diff_len;
+                        bo->bo_tim_trailerlen += diff_len;
+
+                        len_changed = 1;
+                }
+                memcpy(bo->bo_appie_buf,vap->app_ie[IEEE80211_APPIE_FRAME_BEACON].ie,
+                        vap->app_ie[IEEE80211_APPIE_FRAME_BEACON].length);
+
+                vap->iv_flags_ext &= ~IEEE80211_FEXT_APPIE_UPDATE;
+        }
+
-        IEEE80211_BEACON_UNLOCK(ic);
-
-        return len_changed;

net80211/ieee80211_wireless.c

@@ -2623 +2623 @@
-        return 0;
-}
-
+/* the following macros are used by the set/get appiebuf functions */
+static int add_app_ie(unsigned int frame_type_index,struct ieee80211vap *vap,
+                      struct ieee80211req_getset_appiebuf *iebuf)
+{
+     void * ie;
+
+    /* NB: data.length is validated by the wireless extensions code */
+         MALLOC(ie, void *,iebuf->app_buflen, M_DEVBUF, M_WAITOK);
+         if (ie == NULL)
+          return -ENOMEM;
+         memcpy(ie,iebuf->app_buf,iebuf->app_buflen);
+         if (vap->app_ie[frame_type_index].ie != NULL)
+             FREE(vap->app_ie[frame_type_index].ie, M_DEVBUF);
+         vap->app_ie[frame_type_index].ie = ie;
+             vap->app_ie[frame_type_index].length = iebuf->app_buflen;
+
+     return 0;
+}
+
+static int remove_app_ie(unsigned int frame_type_index,struct ieee80211vap *vap)
+{
+     if (vap->app_ie[frame_type_index].ie != NULL) {
+         FREE(vap->app_ie[frame_type_index].ie, M_DEVBUF);
+         vap->app_ie[frame_type_index].ie = NULL;
+             vap->app_ie[frame_type_index].length = 0;
+     }
+     return 0;
+}
+
+static int get_app_ie(unsigned int frame_type_index,struct ieee80211vap *vap,
+                      struct ieee80211req_getset_appiebuf *iebuf)
+{
+     if (iebuf->app_buflen < vap->app_ie[frame_type_index].length)
+         return -EINVAL;
+
+     iebuf->app_buflen = vap->app_ie[frame_type_index].length;
+     memcpy(iebuf->app_buf,vap->app_ie[frame_type_index].ie,
+                               iebuf->app_buflen);
+     return 0;
+}
+
-static int
+ieee80211_ioctl_setappiebuf(struct net_device *dev,
+                            struct iw_request_info *info,
+                                        void *w, char *extra)
+{
+        struct ieee80211vap *vap = dev->priv;
+        struct ieee80211req_getset_appiebuf *iebuf =      \
+                      ( struct ieee80211req_getset_appiebuf *)extra;
+        int rc = 0;
+
+        if (iebuf->app_buflen > IEEE80211_APPIE_MAX)
+             return -EINVAL;
+
+        switch(iebuf->app_frmtype) {
+        case IEEE80211_APPIE_FRAME_BEACON:
+               if (vap->iv_opmode != IEEE80211_M_HOSTAP)
+                  return -EINVAL;
+               if (iebuf->app_buflen)
+                   rc = add_app_ie(IEEE80211_APPIE_FRAME_BEACON,vap,iebuf);
+               else
+                   rc = remove_app_ie(IEEE80211_APPIE_FRAME_BEACON,vap);
+               if (rc==0) {
+                   vap->iv_flags_ext |= IEEE80211_FEXT_APPIE_UPDATE;
+               } else {
+                   return rc;
+               }
+             break;
+        case IEEE80211_APPIE_FRAME_PROBE_REQ:
+               if (vap->iv_opmode != IEEE80211_M_STA)
+                  return -EINVAL;
+               if (iebuf->app_buflen)
+                  rc = add_app_ie(IEEE80211_APPIE_FRAME_PROBE_REQ,vap,iebuf);
+               else
+                  rc = remove_app_ie(IEEE80211_APPIE_FRAME_PROBE_REQ,vap);
+             break;
+        case IEEE80211_APPIE_FRAME_PROBE_RESP:
+               if (vap->iv_opmode != IEEE80211_M_HOSTAP)
+                  return -EINVAL;
+               if (iebuf->app_buflen)
+                  rc = add_app_ie(IEEE80211_APPIE_FRAME_PROBE_RESP,vap,iebuf);
+               else
+                  rc = remove_app_ie(IEEE80211_APPIE_FRAME_PROBE_RESP,vap);
+             break;
+        case IEEE80211_APPIE_FRAME_ASSOC_REQ:
+               if(vap->iv_opmode != IEEE80211_M_STA)
+                  return -EINVAL;
+               if(iebuf->app_buflen)
+                  rc = add_app_ie(IEEE80211_APPIE_FRAME_ASSOC_REQ,vap,iebuf);
+               else
+                  rc = remove_app_ie(IEEE80211_APPIE_FRAME_ASSOC_REQ,vap);
+             break;
+        case IEEE80211_APPIE_FRAME_ASSOC_RESP:
+               if(vap->iv_opmode != IEEE80211_M_HOSTAP)
+                  return -EINVAL;
+               if(iebuf->app_buflen)
+                  rc = add_app_ie(IEEE80211_APPIE_FRAME_ASSOC_RESP,vap,iebuf);
+               else
+                  rc = remove_app_ie(IEEE80211_APPIE_FRAME_ASSOC_RESP,vap);
+             break;
+        default:
+                return -EINVAL;
+
+        }
+
+        return rc;
+}
+
+static int
+ieee80211_ioctl_getappiebuf(struct net_device *dev, struct iw_request_info *info,
+                         void *w, char *extra)
+{
+        struct ieee80211vap *vap = dev->priv;
+        struct ieee80211req_getset_appiebuf *iebuf = \
+                              ( struct ieee80211req_getset_appiebuf *)extra;
+
+
+        switch(iebuf->app_frmtype) {
+        case IEEE80211_APPIE_FRAME_BEACON:
+               if(vap->iv_opmode == IEEE80211_M_STA)
+                  return -EINVAL;
+               get_app_ie(IEEE80211_APPIE_FRAME_BEACON,vap,iebuf);
+             break;
+        case IEEE80211_APPIE_FRAME_PROBE_REQ:
+               if(vap->iv_opmode != IEEE80211_M_STA)
+                  return -EINVAL;
+               get_app_ie(IEEE80211_APPIE_FRAME_PROBE_REQ,vap,iebuf);
+             break;
+        case IEEE80211_APPIE_FRAME_PROBE_RESP:
+               if(vap->iv_opmode == IEEE80211_M_STA)
+                  return -EINVAL;
+               get_app_ie(IEEE80211_APPIE_FRAME_PROBE_RESP,vap,iebuf);
+             break;
+        case IEEE80211_APPIE_FRAME_ASSOC_REQ:
+               if(vap->iv_opmode != IEEE80211_M_STA)
+                  return -EINVAL;
+               get_app_ie(IEEE80211_APPIE_FRAME_ASSOC_REQ,vap,iebuf);
+             break;
+        case IEEE80211_APPIE_FRAME_ASSOC_RESP:
+               if(vap->iv_opmode == IEEE80211_M_STA)
+                  return -EINVAL;
+               get_app_ie(IEEE80211_APPIE_FRAME_ASSOC_RESP,vap,iebuf);
+             break;
+        default:
+                return -EINVAL;
+
+        }
+
+       return 0;
+
+}
+
+static int
+ieee80211_ioctl_setfilter(struct net_device *dev, struct iw_request_info *info,
+                         void *w, char *extra)
+{
+        struct ieee80211vap *vap = dev->priv;
+        struct ieee80211req_set_filter *app_filter = ( struct ieee80211req_set_filter *)extra;
+
+        if ((extra == NULL) || (app_filter->app_filterype & ~IEEE80211_FILTER_TYPE_ALL))
+           return -EINVAL;
+
+        vap->app_filter =  app_filter->app_filterype;
+        /* printf("driver filter=%x\n", vap->app_filter); */
+
+        return 0;
+}
+
+
+static int
-ieee80211_ioctl_setkey(struct net_device *dev, struct iw_request_info *info,
-        void *w, char *extra)
-{
@@ -3607 +3776 @@
-        IW_PRIV_TYPE_BYTE | sizeof(struct ieee80211req_chanlist)
-#define IW_PRIV_TYPE_CHANINFO \
-        IW_PRIV_TYPE_BYTE | sizeof(struct ieee80211req_chaninfo)
+#define IW_PRIV_TYPE_APPIEBUF  (IW_PRIV_TYPE_BYTE | IEEE80211_APPIE_MAX)
+#define IW_PRIV_TYPE_FILTER \
+        IW_PRIV_TYPE_BYTE | sizeof(struct ieee80211req_set_filter)
-
-static const struct iw_priv_args ieee80211_priv_args[] = {
-        /* NB: setoptie & getoptie are !IW_PRIV_SIZE_FIXED */
@@ -3929 +4101 @@
-          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "markdfs" },
-        { IEEE80211_PARAM_MARKDFS,
-          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_markdfs" },
+        { IEEE80211_IOCTL_SET_APPIEBUF,
+          IW_PRIV_TYPE_APPIEBUF, 0, "setiebuf" },
+        { IEEE80211_IOCTL_GET_APPIEBUF,
+          0, IW_PRIV_TYPE_APPIEBUF, "getiebuf" },
+        { IEEE80211_IOCTL_FILTERFRAME,
+          IW_PRIV_TYPE_FILTER , 0, "setfilter" },
-
-#endif /* WIRELESS_EXT >= 12 */
-};
@@ -3996 +4174 @@
-        (iw_handler) ieee80211_ioctl_setchanlist,       /* SIOCIWFIRSTPRIV+6 */
-        (iw_handler) ieee80211_ioctl_getchanlist,       /* SIOCIWFIRSTPRIV+7 */
-        (iw_handler) ieee80211_ioctl_chanswitch,        /* SIOCIWFIRSTPRIV+8 */
-NULL,                     
-NULL,                     
+ieee80211_ioctl_getappiebuf,
+ieee80211_ioctl_setappiebuf,
-        (iw_handler) ieee80211_ioctl_getscanresults,    /* SIOCIWFIRSTPRIV+11 */
-NULL,             
+ieee80211_ioctl_setfilter,
-        (iw_handler) ieee80211_ioctl_getchaninfo,       /* SIOCIWFIRSTPRIV+13 */
-        (iw_handler) ieee80211_ioctl_setoptie,          /* SIOCIWFIRSTPRIV+14 */
-        (iw_handler) ieee80211_ioctl_getoptie,          /* SIOCIWFIRSTPRIV+15 */

net80211/ieee80211_input.c

@@ -2215 +2215 @@
-                time_after(jiffies, ic->ic_lastdata + vap->iv_bgscanidle));
-}
-
+static void
+forward_mgmt_to_app(struct ieee80211vap *vap, int subtype,struct sk_buff *skb,
+                    struct ieee80211_frame *wh)
+{
+        struct net_device *dev = vap->iv_dev;
+        int filter_flag =0;
+
+        switch (subtype) {
+                case IEEE80211_FC0_SUBTYPE_BEACON:
+                        filter_flag = vap->app_filter & IEEE80211_FILTER_TYPE_BEACON;
+                        break;
+                case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
+                        filter_flag = vap->app_filter & IEEE80211_FILTER_TYPE_PROBE_REQ;
+                        break;
+                case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
+                        filter_flag = vap->app_filter & IEEE80211_FILTER_TYPE_PROBE_RESP;
+                        break;
+                case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
+                case IEEE80211_FC0_SUBTYPE_REASSOC_REQ:
+                        filter_flag = vap->app_filter & IEEE80211_FILTER_TYPE_ASSOC_REQ;
+                        break;
+                case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
+                case IEEE80211_FC0_SUBTYPE_REASSOC_RESP:
+                        filter_flag = vap->app_filter & IEEE80211_FILTER_TYPE_ASSOC_RESP;
+                        break;
+                case IEEE80211_FC0_SUBTYPE_AUTH:
+                        filter_flag = vap->app_filter & IEEE80211_FILTER_TYPE_AUTH;
+                        break;
+                case IEEE80211_FC0_SUBTYPE_DEAUTH:
+                        filter_flag = vap->app_filter & IEEE80211_FILTER_TYPE_DEAUTH;
+                        break;
+                case IEEE80211_FC0_SUBTYPE_DISASSOC:
+                        filter_flag = vap->app_filter & IEEE80211_FILTER_TYPE_DISASSOC;
+                        break;
+                default:
+                        break;
+        }
+
+        if (filter_flag) {
+                struct sk_buff *skb1;
+
+                skb1 = skb_copy(skb, GFP_ATOMIC);
+                if(skb1==NULL)
+                        return;
+                skb1->dev = dev;
+                skb1->mac.raw = skb1->data;
+                skb1->ip_summed = CHECKSUM_NONE;
+                skb1->pkt_type = PACKET_OTHERHOST;
+                skb1->protocol = __constant_htons(0x0019);  /* ETH_P_80211_RAW */
+        
+                netif_rx(skb1);
+        }
+}
+
-void
-ieee80211_recv_mgmt(struct ieee80211_node *ni, struct sk_buff *skb,
-        int subtype, int rssi, u_int32_t rstamp)
@@ -2233 +2287 @@
-        wh = (struct ieee80211_frame *) skb->data;
-        frm = (u_int8_t *)&wh[1];
-        efrm = skb->data + skb->len;
+
+        /* forward management frame to application */
+        if (vap->iv_opmode != IEEE80211_M_MONITOR)
+                forward_mgmt_to_app(vap,subtype,skb,wh);
+
+
-        switch (subtype) {
-        case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
-        case IEEE80211_FC0_SUBTYPE_BEACON: {

net80211/ieee80211_output.c

@@ -1695 +1695 @@
-        skb = ieee80211_getmgtframe(&frm, 2 + IEEE80211_NWID_LEN + 
-               2 + IEEE80211_RATE_SIZE + 
-               2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE) + 
-
+
+
-        if (skb == NULL) {
-                vap->iv_stats.is_tx_nobuf++;
-                ieee80211_free_node(ni);
@@ -1711 +1712 @@
-                memcpy(frm, optie, optielen);
-                frm += optielen;
-        }
+
+        if(vap->app_ie[IEEE80211_APPIE_FRAME_PROBE_REQ].ie){
+                memcpy(frm, vap->app_ie[IEEE80211_APPIE_FRAME_PROBE_REQ].ie,
+                        vap->app_ie[IEEE80211_APPIE_FRAME_PROBE_REQ].length);
+                frm += vap->app_ie[IEEE80211_APPIE_FRAME_PROBE_REQ].length;
+        }
+
-        skb_trim(skb, frm - skb->data);
-
-        cb = (struct ieee80211_cb *)skb->cb;
@@ -1803 +1811 @@
-                        + (vap->iv_ath_cap & IEEE80211_ATHC_XR ?        /* XR */
-                                sizeof(struct ieee80211_xr_param) : 0)
-#endif
+                        + vap->app_ie[IEEE80211_APPIE_FRAME_ASSOC_RESP].length
-                );
-                if (skb == NULL)
-                        senderr(ENOMEM, is_tx_nobuf);
@@ -1874 +1883 @@
-                if (vap->iv_ath_cap & IEEE80211_ATHC_XR)        /* XR */
-                        frm = ieee80211_add_xr_param(frm, vap);
-#endif
+                if(vap->app_ie[IEEE80211_APPIE_FRAME_ASSOC_RESP].ie) {
+                        memcpy(frm, vap->app_ie[IEEE80211_APPIE_FRAME_ASSOC_RESP].ie,
+                                vap->app_ie[IEEE80211_APPIE_FRAME_ASSOC_RESP].length);
+                        frm += vap->app_ie[IEEE80211_APPIE_FRAME_ASSOC_RESP].length;
+                }
+
-                skb_trim(skb, frm - skb->data);
-                break;
-
@@ -1971 +1986 @@
-                        4 + 2 + IEEE80211_SUPPCHAN_LEN +
-                        sizeof(struct ieee80211_ie_wme) +
-                        sizeof(struct ieee80211_ie_athAdvCap) +
-
+
+
-                if (skb == NULL)
-                        senderr(ENOMEM, is_tx_nobuf);
-
@@ -2030 +2046 @@
-                        memcpy(frm, vap->iv_opt_ie, vap->iv_opt_ie_len);
-                        frm += vap->iv_opt_ie_len;
-                }
+
+                if(vap->app_ie[IEEE80211_APPIE_FRAME_ASSOC_REQ].ie){
+                        memcpy(frm, vap->app_ie[IEEE80211_APPIE_FRAME_ASSOC_REQ].ie,
+                                vap->app_ie[IEEE80211_APPIE_FRAME_ASSOC_REQ].length);
+                        frm += vap->app_ie[IEEE80211_APPIE_FRAME_ASSOC_REQ].length;
+                }
+
-                skb_trim(skb, frm - skb->data);
-
-                timer = IEEE80211_TRANS_WAIT;
@@ -2052 +2075 @@
-                        2 + IEEE80211_RATE_SIZE +
-                        2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE) +
-                        sizeof(struct ieee80211_wme_param) +
-
+
+
-                if (skb == NULL)
-                        senderr(ENOMEM, is_tx_nobuf);
-
@@ -2087 +2111 @@
-                                vap->iv_ath_cap & ni->ni_ath_flags,
-                                ni->ni_ath_defkeyindex); 
-
+                if(vap->app_ie[IEEE80211_APPIE_FRAME_ASSOC_RESP].ie){
+                        memcpy(frm, vap->app_ie[IEEE80211_APPIE_FRAME_ASSOC_RESP].ie,
+                                vap->app_ie[IEEE80211_APPIE_FRAME_ASSOC_RESP].length);
+                        frm += vap->app_ie[IEEE80211_APPIE_FRAME_ASSOC_RESP].length;
+                }
+
-                skb_trim(skb, frm - skb->data);
-                break;
-

net80211/ieee80211_var.h

@@ -88 +88 @@
-#define IEEE80211_TU_TO_MS(x)   (((x) * 1024) / 1000)
-#define IEEE80211_TU_TO_JIFFIES(x) ((IEEE80211_TU_TO_MS(x) * HZ) / 1000)
-
+#define IEEE80211_APPIE_MAX        1024
+
-#define IEEE80211_PWRCONSTRAINT_VAL(ic) \
-        (((ic)->ic_bsschan->ic_maxregpower > (ic)->ic_curchanmaxpwr) ? \
-            (ic)->ic_bsschan->ic_maxregpower - (ic)->ic_curchanmaxpwr : 0)
@@ -264 +266 @@
-        u_int8_t num;
-};
-
+struct ieee80211_app_ie_t {
+    u_int32_t length;
+    u_int8_t *ie;
+};
+
-struct ieee80211vap {
-        struct net_device *iv_dev;              /* associated device */
-        struct net_device_stats iv_devstats;    /* interface statistics */
@@ -367 +374 @@
-        unsigned int iv_nsdone;                 /* Done with scheduled newstate tasklet */
-        uint8_t wds_mac[IEEE80211_ADDR_LEN];
-        struct ieee80211_spy iv_spy;            /* IWSPY support */
+        struct ieee80211_app_ie_t  app_ie[IEEE80211_APPIE_NUM_OF_FRAME];
+        u_int32_t                  app_filter;
+
-};
-MALLOC_DECLARE(M_80211_VAP);
-
@@ -424 +434 @@
-#define IEEE80211_FEXT_REGCLASS 0x00000100      /* CONF: send regclassids in country ie */
-#define IEEE80211_FEXT_ERPUPDATE 0x00000200     /* STATUS: update ERP element */
-#define IEEE80211_FEXT_SWBMISS 0x00000400       /* CONF: use software beacon timer */
+#define IEEE80211_FEXT_APPIE_UPDATE 0x00000800  /* STATE: beacon APP IE updated */
-
-#define IEEE80211_COM_UAPSD_ENABLE(_ic)         ((_ic)->ic_flags_ext |= IEEE80211_FEXT_UAPSD)
-#define IEEE80211_COM_UAPSD_DISABLE(_ic)        ((_ic)->ic_flags_ext &= ~IEEE80211_FEXT_UAPSD)

net80211/ieee80211_proto.h

@@ -264 +264 @@
-        u_int8_t *bo_ath_caps;          /* where ath caps is */
-        u_int8_t *bo_xr;                        /* start of xr element */
-        u_int8_t *bo_erp;               /* start of ERP element */
+        u_int8_t    *bo_appie_buf;  /* start of APP IE buf */
+        u_int16_t   bo_appie_buf_len;
-        u_int16_t bo_chanswitch_trailerlen;
-};
-struct sk_buff *ieee80211_beacon_alloc(struct ieee80211_node *,