Ticket #91: true_wds.diff

net80211/ieee80211_ioctl.h

@@ -517 +517 @@
-#define IEEE80211_IOCTL_CHANSWITCH      (SIOCIWFIRSTPRIV+16)
-#define IEEE80211_IOCTL_SETMODE         (SIOCIWFIRSTPRIV+17)
-#define IEEE80211_IOCTL_GETMODE         (SIOCIWFIRSTPRIV+18)
+#define IEEE80211_IOCTL_WDSADDMAC       (SIOCIWFIRSTPRIV+19)
+#define IEEE80211_IOCTL_WDSDELMAC       (SIOCIWFIRSTPRIV+20)
-enum {
-        IEEE80211_WMMPARAMS_CWMIN       = 1,
-        IEEE80211_WMMPARAMS_CWMAX       = 2,

net80211/ieee80211.c

@@ -70 +70 @@
-
-MALLOC_DEFINE(M_80211_VAP, "80211vap", "802.11 vap state");
-
-
-/*
- * Country Code Table for code-to-string conversion.
- */
@@ -519 +518 @@
-        ieee80211_node_latevattach(vap);        /* XXX move into vattach */
-        ieee80211_power_latevattach(vap);       /* XXX move into vattach */
-
+        memset(vap->wds_mac, 0x00, IEEE80211_ADDR_LEN);
+
-        (void) ieee80211_media_setup(ic, &vap->iv_media,
-                vap->iv_caps, media_change, media_status);
-        ieee80211_media_status(dev, &imr);

net80211/ieee80211_node.c

@@ -850 +850 @@
-/* Add wds address to the node table */
-int
-ieee80211_add_wds_addr(struct ieee80211_node_table *nt,
-
+, u_int8_t wds_static
-{
-        int hash;
-        struct ieee80211_wds_addr *wds;
@@ -861 +861 @@
-                /* XXX msg */
-                return 1;
-        }
-
+
+
+
+
-        hash = IEEE80211_NODE_HASH(macaddr);
-        IEEE80211_ADDR_COPY(wds->wds_macaddr, macaddr);
-        ieee80211_ref_node(ni);         /* Reference node */
@@ -875 +878 @@
-
-/* remove wds address from the wds hash table */
-void
- 
+
-                                           const u_int8_t *macaddr)
-{
-        int hash;
@@ -928 +931 @@
-        IEEE80211_NODE_LOCK_BH(nt);
-        for (hash=0; hash<IEEE80211_NODE_HASHSIZE; hash++) {
-                LIST_FOREACH(wds, &nt->nt_wds_hash[hash], wds_hash) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                }
-        }
-        IEEE80211_NODE_UNLOCK_BH(nt);
@@ -1017 +1022 @@
-        LIST_FOREACH(wds, &nt->nt_wds_hash[hash], wds_hash) {
-                if (IEEE80211_ADDR_EQ(wds->wds_macaddr, macaddr)) {
-                        ni = wds->wds_ni;
-
+
+
-                        ieee80211_ref_node(ni);
-                        return ni;
-                }

net80211/ieee80211_node.h

@@ -224 +224 @@
-
-#define WDS_AGING_TIME  600   /* 10 minutes */ 
-#define WDS_AGING_COUNT 2 
+#define WDS_AGING_STATIC 0xffff
-#define WDS_AGING_TIMER_VAL (WDS_AGING_TIME/2)
-
-struct ieee80211_wds_addr {
@@ -291 +292 @@
-                struct ieee80211vap *, const u_int8_t *);
-#endif
-int     ieee80211_add_wds_addr(struct ieee80211_node_table *,
-
+, u_int8_t
-void    ieee80211_remove_wds_addr(struct ieee80211_node_table *,
-                                                          const u_int8_t *);
-void    ieee80211_del_wds_node(struct ieee80211_node_table *,

net80211/ieee80211_wireless.c

@@ -2796 +2796 @@
-}
-
-static int
+ieee80211_ioctl_wdsmac(struct net_device *dev, struct iw_request_info *info,
+                         void *w, char *extra)
+{
+        struct ieee80211vap *vap = dev->priv;
+        struct sockaddr *sa = (struct sockaddr *)extra;
+        struct ieee80211com *ic = vap->iv_ic;
+        struct ieee80211_node *ni;
+
+        if (!IEEE80211_ADDR_NULL(vap->wds_mac)) {
+                printk("%s: Device already has WDS mac address attached, remove first\n", dev->name);
+                goto wdsmac_fail;
+        }
+
+        memcpy(vap->wds_mac, sa->sa_data, IEEE80211_ADDR_LEN);
+
+        ni = ieee80211_alloc_node(&ic->ic_sta, vap, vap->wds_mac);
+        if (ni != NULL) {
+                if (ieee80211_add_wds_addr(&ic->ic_sta, ni, vap->wds_mac, 1) == 0)
+                        ieee80211_node_authorize(ni);
+                else
+                        goto wdsmac_fail;
+        }
+        else
+                goto wdsmac_fail;
+
+        printk("%s: Added WDS MAC: %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", dev->name,
+                vap->wds_mac[0], vap->wds_mac[1], vap->wds_mac[2],
+                vap->wds_mac[3], vap->wds_mac[4], vap->wds_mac[5]);
+
+        return 0;
+
+wdsmac_fail:
+
+        printk("%s: Failed to add WDS MAC: %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", dev->name,
+                sa->sa_data[0], sa->sa_data[1], sa->sa_data[2],
+                sa->sa_data[3], sa->sa_data[4], sa->sa_data[5]);
+
+        return -1;
+}
+
+static int
+ieee80211_ioctl_wdsdelmac(struct net_device *dev, struct iw_request_info *info,
+                         void *w, char *extra)
+{
+        struct ieee80211vap *vap = dev->priv;
+        struct sockaddr *sa = (struct sockaddr *)extra;
+        struct ieee80211com *ic = vap->iv_ic;
+        struct ieee80211_node *ni;
+
+        /* WDS Mac address filed already? */
+        if (IEEE80211_ADDR_NULL(vap->wds_mac)) {
+                return 0;
+        }
+
+        /* Compare suplied MAC address with WDS MAC of this interface 
+         * remove when mac address is known
+         */
+        if (memcmp(vap->wds_mac, sa->sa_data, IEEE80211_ADDR_LEN) == 0)
+        {
+                ni = ieee80211_find_wds_node(&ic->ic_sta,vap->wds_mac);
+                if(ni) {
+                 ieee80211_free_node(ni); /* Decr ref count */
+                }
+                memset(vap->wds_mac, 0x00, IEEE80211_ADDR_LEN);
+                return 0;                        
+        }
+
+        printk("%s: WDS MAC address (%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x) not known by this interface\n", dev->name,
+                sa->sa_data[0], sa->sa_data[1], sa->sa_data[2],
+                sa->sa_data[3], sa->sa_data[4], sa->sa_data[5]);
+
+        return -1;
+}
+
+static int
-ieee80211_ioctl_addmac(struct net_device *dev, struct iw_request_info *info,
-                         void *w, char *extra)
-{
@@ -3423 +3498 @@
-          IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0,"addmac" },
-        { IEEE80211_IOCTL_DELMAC,
-          IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0,"delmac" },
+        { IEEE80211_IOCTL_WDSADDMAC,
+          IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0,"wds_add" },
+        { IEEE80211_IOCTL_WDSDELMAC,
+          IW_PRIV_TYPE_ADDR | IW_PRIV_SIZE_FIXED | 1, 0,"wds_del" },
-        { IEEE80211_IOCTL_SETCHANLIST,
-          IW_PRIV_TYPE_CHANLIST | IW_PRIV_SIZE_FIXED, 0,"setchanlist" },
-        { IEEE80211_IOCTL_GETCHANLIST,
@@ -3799 +3878 @@
-        (iw_handler) ieee80211_ioctl_chanswitch,        /* SIOCWFIRSTPRIV+16 */
-        (iw_handler) ieee80211_ioctl_setmode,           /* SIOCWFIRSTPRIV+17 */
-        (iw_handler) ieee80211_ioctl_getmode,           /* SIOCWFIRSTPRIV+18 */
+        (iw_handler) ieee80211_ioctl_wdsmac,            /* SIOCWFIRSTPRIV+19 */
+        (iw_handler) ieee80211_ioctl_wdsdelmac,         /* SIOCWFIRSTPRIV+20 */
-};
-static struct iw_handler_def ieee80211_iw_handler_def = {
-#define N(a)    (sizeof (a) / sizeof (a[0]))

net80211/ieee80211_input.c

@@ -463 +463 @@
-                                                station. remove the reference to  the previous statation add 
-                                                reference to the new one */
-                                         (void) ieee80211_remove_wds_addr(nt,wh4->i_addr4);
-
+, 0
-                                 }
-                                 if (ni_wds == NULL) {
-
+, 0
-                                 } else
-                                         ieee80211_free_node(ni_wds); /* Decr ref count */
-                         }

net80211/ieee80211_output.c

@@ -236 +236 @@
-         * things like power save.
-         */
-        eh = (struct ether_header *)skb->data;
-
+
+
+
+
+
-        if (ni == NULL) {
-                /* NB: ieee80211_find_txnode does stat+msg */
-                goto bad;
@@ -831 +835 @@
-                                 if(ni_wds) {
-                                         ieee80211_free_node(ni_wds); /* Decr ref count */
-                                 } else {
-
+, 0
-                                 }
-                        }
-                }

net80211/ieee80211_var.h

@@ -364 +364 @@
-        struct ieee80211_nsparams iv_nsparams;  /* new state parameters for tasklet for stajoin1 */
-        struct IEEE80211_TQ_STRUCT iv_stajoin1tq; /* tasklet for newstate action called from stajoin1tq */
-        unsigned int            iv_nsdone;      /* Done with scheduled newstate tasklet */
+        uint8_t wds_mac[IEEE80211_ADDR_LEN];
-};
-MALLOC_DECLARE(M_80211_VAP);
-
+#define IEEE80211_ADDR_NULL(a1) (memcmp(a1, "\x00\x00\x00\x00\x00\x00", \
+        IEEE80211_ADDR_LEN) == 0)
-#define IEEE80211_ADDR_EQ(a1,a2)        (memcmp(a1,a2,IEEE80211_ADDR_LEN) == 0)
-#define IEEE80211_ADDR_COPY(dst,src)    memcpy(dst,src,IEEE80211_ADDR_LEN)
-