Fix build on non-SMP machines of the remote GDB debugging (#2666)

[openwrt.git] / package / madwifi / patches / 121-ibss_hostap.patch

diff --git a/package/madwifi/patches/121-ibss_hostap.patch b/package/madwifi/patches/121-ibss_hostap.patch
index 8a843a2..bb0bbc0 100644 (file)
--- a/package/madwifi/patches/121-ibss_hostap.patch
+++ b/package/madwifi/patches/121-ibss_hostap.patch
@@ -1,7 +1,16 @@
-diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
---- madwifi.old/ath/if_ath.c   2007-06-01 12:22:06.641518272 +0200
-+++ madwifi.dev/ath/if_ath.c   2007-06-01 12:22:55.326117088 +0200
-@@ -1048,9 +1048,12 @@
+Index: madwifi-ng-r2834-20071106/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2834-20071106.orig/ath/if_ath.c        2007-11-07 14:02:02.637521177 +0100
++++ madwifi-ng-r2834-20071106/ath/if_ath.c     2007-11-07 14:02:02.861533944 +0100
+@@ -409,7 +409,6 @@
+  * and use the next two bits as the index of the VAP.
+  */
+ #define ATH_SET_VAP_BSSID_MASK(bssid_mask)      ((bssid_mask)[0] &= ~(((ATH_BCBUF-1)<<2)|0x02))
+-#define ATH_GET_VAP_ID(bssid)                   ((bssid)[0] >> 2)
+ #define ATH_SET_VAP_BSSID(bssid, id) \
+               do { \
+                       if (id) \
+@@ -1059,9 +1058,12 @@

                        ic_opmode = opmode;
                break;
        case IEEE80211_M_IBSS:
                        ic_opmode = opmode;
                break;
        case IEEE80211_M_IBSS:


@@ -17,28 +26,24 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
                break;
        case IEEE80211_M_AHDEMO:
        case IEEE80211_M_MONITOR:
                break;
        case IEEE80211_M_AHDEMO:
        case IEEE80211_M_MONITOR:

-@@ -1080,7 +1083,7 @@
+@@ -1091,7 +1093,7 @@

                return NULL;
        }
  
 -      if (sc->sc_nvaps >= ATH_BCBUF) {
 +      if (sc->sc_nvaps + sc->sc_nibssvaps >= ATH_BCBUF) {
                return NULL;
        }
  
 -      if (sc->sc_nvaps >= ATH_BCBUF) {
 +      if (sc->sc_nvaps + sc->sc_nibssvaps >= ATH_BCBUF) {

-               printk(KERN_WARNING "too many virtual ap's (already got %d)\n", sc->sc_nvaps);
+               printk(KERN_WARNING "too many virtual APs (already got %d)\n", sc->sc_nvaps);

                return NULL;
        }
                return NULL;
        }

-@@ -1115,8 +1118,9 @@
-        */
+@@ -1127,6 +1129,7 @@

        if (opmode == IEEE80211_M_MONITOR)
                dev->type = ARPHRD_IEEE80211_RADIOTAP;
        if (opmode == IEEE80211_M_MONITOR)
                dev->type = ARPHRD_IEEE80211_RADIOTAP;

--      if ((flags & IEEE80211_CLONE_BSSID) &&
--          sc->sc_nvaps != 0 && opmode != IEEE80211_M_WDS && sc->sc_hasbmask) {
+ 

 +      avp->av_bslot = -1;
 +      avp->av_bslot = -1;

-+      if ((flags & IEEE80211_CLONE_BSSID) && sc->sc_hasbmask && 
-+          (opmode == IEEE80211_M_HOSTAP || opmode == IEEE80211_M_IBSS)) {
+       if ((flags & IEEE80211_CLONE_BSSID) &&
+           opmode != IEEE80211_M_WDS && sc->sc_hasbmask) {

                struct ieee80211vap *v;
                struct ieee80211vap *v;

-               unsigned int id_mask, id;
- 
-@@ -1129,18 +1133,22 @@
+@@ -1141,18 +1144,22 @@

  
                /* do a full search to mark all the allocated VAPs */
                id_mask = 0;
  
                /* do a full search to mark all the allocated VAPs */
                id_mask = 0;


@@ -50,7 +55,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
 +                              id_mask |= (1 << a->av_bslot);
 +              }
  
 +                              id_mask |= (1 << a->av_bslot);
 +              }
  

--              for (id = 0; id < ATH_BCBUF; id++) {
+-              for (id = 1; id < ATH_BCBUF; id++) {

 +              /* IBSS mode has local always set, so don't hand out beacon slot 0 to an IBSS vap */
 +              for (id = (opmode == IEEE80211_M_IBSS ? 1 : 0); id < ATH_BCBUF; id++) {
                        /* get the first available slot */
 +              /* IBSS mode has local always set, so don't hand out beacon slot 0 to an IBSS vap */
 +              for (id = (opmode == IEEE80211_M_IBSS ? 1 : 0); id < ATH_BCBUF; id++) {
                        /* get the first available slot */


@@ -65,7 +70,7 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
        STAILQ_INIT(&avp->av_mcastq.axq_q);
        ATH_TXQ_LOCK_INIT(&avp->av_mcastq);
        if (opmode == IEEE80211_M_HOSTAP || opmode == IEEE80211_M_IBSS) {
        STAILQ_INIT(&avp->av_mcastq.axq_q);
        ATH_TXQ_LOCK_INIT(&avp->av_mcastq);
        if (opmode == IEEE80211_M_HOSTAP || opmode == IEEE80211_M_IBSS) {

-@@ -1150,33 +1158,14 @@
+@@ -1162,33 +1169,14 @@

                 */
                avp->av_bcbuf = STAILQ_FIRST(&sc->sc_bbuf);
                STAILQ_REMOVE_HEAD(&sc->sc_bbuf, bf_list);
                 */
                avp->av_bcbuf = STAILQ_FIRST(&sc->sc_bbuf);
                STAILQ_REMOVE_HEAD(&sc->sc_bbuf, bf_list);


@@ -101,29 +106,28 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
                        /*
                         * Multiple VAPs are to transmit beacons and we
                         * have h/w support for TSF adjusting; enable use
                        /*
                         * Multiple VAPs are to transmit beacons and we
                         * have h/w support for TSF adjusting; enable use

-@@ -1286,7 +1275,9 @@
+@@ -1298,7 +1286,9 @@

                        sc->sc_stagbeacons = 0;
        }
  
 -      if (vap->iv_opmode == IEEE80211_M_STA) {
 +      if (vap->iv_opmode == IEEE80211_M_IBSS) {
                        sc->sc_stagbeacons = 0;
        }
  
 -      if (vap->iv_opmode == IEEE80211_M_STA) {
 +      if (vap->iv_opmode == IEEE80211_M_IBSS) {

-+              sc->sc_nibssvaps--;     
++              sc->sc_nibssvaps--;

 +      } else if (vap->iv_opmode == IEEE80211_M_STA) {
                sc->sc_nstavaps--;
                sc->sc_nostabeacons = 0;
        } else if (vap->iv_opmode == IEEE80211_M_MONITOR)
 +      } else if (vap->iv_opmode == IEEE80211_M_STA) {
                sc->sc_nstavaps--;
                sc->sc_nostabeacons = 0;
        } else if (vap->iv_opmode == IEEE80211_M_MONITOR)

-@@ -3356,7 +3347,8 @@
-                HAL_RX_FILTER_MCAST;
-       if (ic->ic_opmode != IEEE80211_M_STA)
-               rfilt |= HAL_RX_FILTER_PROBEREQ;
--      if (ic->ic_opmode != IEEE80211_M_HOSTAP && (dev->flags & IFF_PROMISC))
-+      if ((ic->ic_opmode != IEEE80211_M_HOSTAP && (dev->flags & IFF_PROMISC)) ||
-+              ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0)))
-               rfilt |= HAL_RX_FILTER_PROM;
-       if (ic->ic_opmode == IEEE80211_M_STA ||
+@@ -3517,7 +3507,7 @@

            sc->sc_opmode == HAL_M_IBSS ||      /* NB: AHDEMO too */
            sc->sc_opmode == HAL_M_IBSS ||      /* NB: AHDEMO too */

-@@ -5809,12 +5801,19 @@
-                       type = ieee80211_input(ni, skb, rs->rs_rssi, rs->rs_tstamp);
+           (sc->sc_nostabeacons) || sc->sc_scanning)
+               rfilt |= HAL_RX_FILTER_BEACON;
+-      if (sc->sc_nmonvaps > 0)
++      if ((sc->sc_nmonvaps > 0) || ((sc->sc_nvaps > 0) && (sc->sc_nibssvaps > 0)))
+               rfilt |= (HAL_RX_FILTER_CONTROL | HAL_RX_FILTER_BEACON |
+                         HAL_RX_FILTER_PROBEREQ | HAL_RX_FILTER_PROM);
+       return rfilt;
+@@ -5953,12 +5943,20 @@
+                       type = ieee80211_input(ni, skb, rs->rs_rssi, rs_tsf);

                        ieee80211_unref_node(&ni);
                } else {
 +                      const struct ieee80211_frame_min *wh = (const struct ieee80211_frame_min *) skb->data;
                        ieee80211_unref_node(&ni);
                } else {
 +                      const struct ieee80211_frame_min *wh = (const struct ieee80211_frame_min *) skb->data;


@@ -133,7 +137,8 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
                         */
 -                      ni = ieee80211_find_rxnode(ic,
 -                              (const struct ieee80211_frame_min *) skb->data);
                         */
 -                      ni = ieee80211_find_rxnode(ic,
 -                              (const struct ieee80211_frame_min *) skb->data);

-+                      if ((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_PROBE_REQ)
++                      if (((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_PROBE_REQ) &&
++                                      (sc->sc_nibssvaps > 0))

 +                              /* if this is a probe request, send it to all vaps
 +                               * when looking up nodes, hostap will be preferred over ibss,
 +                               * because ibss will catch all nodes */
 +                              /* if this is a probe request, send it to all vaps
 +                               * when looking up nodes, hostap will be preferred over ibss,
 +                               * because ibss will catch all nodes */


@@ -144,10 +149,11 @@ diff -ur madwifi.old/ath/if_ath.c madwifi.dev/ath/if_ath.c
                        if (ni != NULL) {
                                struct ath_node *an = ATH_NODE(ni);
                                ieee80211_keyix_t keyix;
                        if (ni != NULL) {
                                struct ath_node *an = ATH_NODE(ni);
                                ieee80211_keyix_t keyix;

-diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
---- madwifi.old/ath/if_athvar.h        2007-06-01 12:22:06.642518120 +0200
-+++ madwifi.dev/ath/if_athvar.h        2007-06-01 12:21:54.640342728 +0200
-@@ -199,7 +199,7 @@
+Index: madwifi-ng-r2834-20071106/ath/if_athvar.h
+===================================================================
+--- madwifi-ng-r2834-20071106.orig/ath/if_athvar.h     2007-11-07 14:01:59.457339950 +0100
++++ madwifi-ng-r2834-20071106/ath/if_athvar.h  2007-11-07 14:02:02.861533944 +0100
+@@ -209,7 +209,7 @@

  #define       ATH_RXBUF       40              /* number of RX buffers */
  #define       ATH_TXBUF       200             /* number of TX buffers */
  
  #define       ATH_RXBUF       40              /* number of RX buffers */
  #define       ATH_TXBUF       200             /* number of TX buffers */
  


@@ -156,17 +162,18 @@ diff -ur madwifi.old/ath/if_athvar.h madwifi.dev/ath/if_athvar.h
  
  /* free buffer threshold to restart net dev */
  #define       ATH_TXBUF_FREE_THRESHOLD  (ATH_TXBUF / 20)
  
  /* free buffer threshold to restart net dev */
  #define       ATH_TXBUF_FREE_THRESHOLD  (ATH_TXBUF / 20)

-@@ -594,6 +594,7 @@
-       u_int16_t sc_nvaps;                     /* # of active virtual ap's */
-       u_int8_t sc_nstavaps;                   /* # of active station vaps */
-       u_int8_t sc_nmonvaps;                   /* # of monitor vaps */
+@@ -610,6 +610,7 @@
+       u_int16_t sc_nvaps;                     /* # of active virtual APs */
+       u_int8_t sc_nstavaps;                   /* # of active station VAPs */
+       u_int8_t sc_nmonvaps;                   /* # of monitor VAPs */

 +      u_int8_t sc_nibssvaps;                  /* # of active ibss vaps */
        u_int8_t sc_nbcnvaps;                   /* # of vaps sending beacons */
        u_int sc_fftxqmin;                      /* aggregation threshold */
        HAL_INT sc_imask;                       /* interrupt mask copy */
 +      u_int8_t sc_nibssvaps;                  /* # of active ibss vaps */
        u_int8_t sc_nbcnvaps;                   /* # of vaps sending beacons */
        u_int sc_fftxqmin;                      /* aggregation threshold */
        HAL_INT sc_imask;                       /* interrupt mask copy */

-diff -ur madwifi.old/net80211/ieee80211_beacon.c madwifi.dev/net80211/ieee80211_beacon.c
---- madwifi.old/net80211/ieee80211_beacon.c    2007-06-01 12:22:06.642518120 +0200
-+++ madwifi.dev/net80211/ieee80211_beacon.c    2007-06-01 12:21:54.640342728 +0200
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_beacon.c
+===================================================================
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_beacon.c 2007-11-07 14:01:59.461340176 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_beacon.c      2007-11-07 14:02:02.869534399 +0100

 @@ -111,7 +111,7 @@
        bo->bo_tim = frm;
  
 @@ -111,7 +111,7 @@
        bo->bo_tim = frm;
  


@@ -176,10 +183,11 @@ diff -ur madwifi.old/net80211/ieee80211_beacon.c madwifi.dev/net80211/ieee80211_
                *frm++ = IEEE80211_ELEMID_IBSSPARMS;
                *frm++ = 2;
                *frm++ = 0; *frm++ = 0;         /* TODO: ATIM window */
                *frm++ = IEEE80211_ELEMID_IBSSPARMS;
                *frm++ = 2;
                *frm++ = 0; *frm++ = 0;         /* TODO: ATIM window */

-diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_input.c
---- madwifi.old/net80211/ieee80211_input.c     2007-06-01 12:22:06.645517664 +0200
-+++ madwifi.dev/net80211/ieee80211_input.c     2007-06-01 12:21:54.642342424 +0200
-@@ -2953,7 +2953,13 @@
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_input.c
+===================================================================
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_input.c  2007-11-07 14:01:59.469340634 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_input.c       2007-11-07 14:02:02.873534629 +0100
+@@ -2990,7 +2990,13 @@

                        return;
                }
                if (ni == vap->iv_bss) {
                        return;
                }
                if (ni == vap->iv_bss) {


@@ -194,7 +202,7 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i
                                /*
                                 * XXX Cannot tell if the sender is operating
                                 * in ibss mode.  But we need a new node to
                                /*
                                 * XXX Cannot tell if the sender is operating
                                 * in ibss mode.  But we need a new node to

-@@ -2962,12 +2968,13 @@
+@@ -2999,12 +3005,13 @@

                                 */
                                ni = ieee80211_fakeup_adhoc_node(vap,
                                        wh->i_addr2);
                                 */
                                ni = ieee80211_fakeup_adhoc_node(vap,
                                        wh->i_addr2);


@@ -209,17 +217,17 @@ diff -ur madwifi.old/net80211/ieee80211_input.c madwifi.dev/net80211/ieee80211_i
                }
  
                IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_INPUT, wh->i_addr2,
                }
  
                IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_INPUT, wh->i_addr2,

-diff -ur madwifi.old/net80211/ieee80211_node.c madwifi.dev/net80211/ieee80211_node.c
---- madwifi.old/net80211/ieee80211_node.c      2007-06-01 12:22:06.646517512 +0200
-+++ madwifi.dev/net80211/ieee80211_node.c      2007-06-01 12:21:54.644342120 +0200
-@@ -1082,8 +1082,25 @@
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_node.c
+===================================================================
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_node.c   2007-11-07 14:02:01.789472851 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_node.c        2007-11-07 14:02:02.873534629 +0100
+@@ -1103,8 +1103,25 @@

        IEEE80211_NODE_TABLE_LOCK_ASSERT(nt);
  
        hash = IEEE80211_NODE_HASH(macaddr);
        IEEE80211_NODE_TABLE_LOCK_ASSERT(nt);
  
        hash = IEEE80211_NODE_HASH(macaddr);

-+      
++

 +      /* look for non-ibss nodes first */
 +      /* look for non-ibss nodes first */

-       LIST_FOREACH(ni, &nt->nt_hash[hash], ni_hash) {
--              if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr)) {
++      LIST_FOREACH(ni, &nt->nt_hash[hash], ni_hash) {

 +              if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr) && ni->ni_vap->iv_opmode != IEEE80211_M_IBSS) {
 +                      ieee80211_ref_node(ni); /* mark referenced */
 +#ifdef IEEE80211_DEBUG_REFCNT
 +              if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr) && ni->ni_vap->iv_opmode != IEEE80211_M_IBSS) {
 +                      ieee80211_ref_node(ni); /* mark referenced */
 +#ifdef IEEE80211_DEBUG_REFCNT


@@ -234,7 +242,8 @@ diff -ur madwifi.old/net80211/ieee80211_node.c madwifi.dev/net80211/ieee80211_no
 +      }
 +
 +      /* now look for ibss nodes */
 +      }
 +
 +      /* now look for ibss nodes */

-+      LIST_FOREACH(ni, &nt->nt_hash[hash], ni_hash) {
+       LIST_FOREACH(ni, &nt->nt_hash[hash], ni_hash) {
+-              if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr)) {

 +              if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr) && ni->ni_vap->iv_opmode == IEEE80211_M_IBSS) {
                        ieee80211_ref_node(ni); /* mark referenced */
  #ifdef IEEE80211_DEBUG_REFCNT
 +              if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr) && ni->ni_vap->iv_opmode == IEEE80211_M_IBSS) {
                        ieee80211_ref_node(ni); /* mark referenced */
  #ifdef IEEE80211_DEBUG_REFCNT