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

[openwrt.git] / package / madwifi / patches / 112-keycache_PR_962.patch

diff --git a/package/madwifi/patches/112-keycache_PR_962.patch b/package/madwifi/patches/112-keycache_PR_962.patch
index e8ca188..9d738b1 100644 (file)
--- a/package/madwifi/patches/112-keycache_PR_962.patch
+++ b/package/madwifi/patches/112-keycache_PR_962.patch
@@ -1,20 +1,22 @@
-diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c
---- madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c        2007-05-13 18:17:55.691102704 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c        2007-05-13 18:17:55.783088720 +0200
-@@ -5704,7 +5704,8 @@
+Index: madwifi-ng-r2834-20071106/ath/if_ath.c
+===================================================================
+--- madwifi-ng-r2834-20071106.orig/ath/if_ath.c        2007-11-07 14:02:00.957425434 +0100
++++ madwifi-ng-r2834-20071106/ath/if_ath.c     2007-11-07 14:02:01.785472625 +0100
+@@ -5853,7 +5853,8 @@

                 * frame; it'll be dropped where it's not wanted.
                 */
                 * frame; it'll be dropped where it's not wanted.
                 */

-               if (ds->ds_rxstat.rs_keyix != HAL_RXKEYIX_INVALID &&
--                  (ni = sc->sc_keyixmap[ds->ds_rxstat.rs_keyix]) != NULL) {
-+                  (ni = sc->sc_keyixmap[ds->ds_rxstat.rs_keyix]) != NULL &&
-+                  ieee80211_check_rxnode(ni, (const struct ieee80211_frame_min *) skb->data)) {
+               if (rs->rs_keyix != HAL_RXKEYIX_INVALID &&
+-                  (ni = sc->sc_keyixmap[rs->rs_keyix]) != NULL) {
++                  ((ni = sc->sc_keyixmap[rs->rs_keyix]) != NULL) &&
++                      ieee80211_check_rxnode(ni, (const struct ieee80211_frame_min *) skb->data)) {

                        struct ath_node *an;
                        /*
                         * Fast path: node is present in the key map;
                        struct ath_node *an;
                        /*
                         * Fast path: node is present in the key map;

-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_node.c madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_node.c
---- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_node.c   2007-05-13 18:17:55.773090240 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_node.c   2007-05-13 18:17:55.784088568 +0200
-@@ -1268,8 +1268,6 @@
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_node.c
+===================================================================
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_node.c   2007-11-07 14:01:59.581347018 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_node.c        2007-11-07 14:02:01.789472851 +0100
+@@ -1290,8 +1290,6 @@

        IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
  
        return ni;
        IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
  
        return ni;


@@ -23,7 +25,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_node.c madwi
  }
  #ifdef IEEE80211_DEBUG_REFCNT
  EXPORT_SYMBOL(ieee80211_find_rxnode_debug);
  }
  #ifdef IEEE80211_DEBUG_REFCNT
  EXPORT_SYMBOL(ieee80211_find_rxnode_debug);

-@@ -1277,6 +1275,20 @@
+@@ -1299,6 +1297,20 @@

  EXPORT_SYMBOL(ieee80211_find_rxnode);
  #endif
  
  EXPORT_SYMBOL(ieee80211_find_rxnode);
  #endif
  


@@ -44,10 +46,11 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_node.c madwi
  /*
   * Return a reference to the appropriate node for sending
   * a data frame.  This handles node discovery in adhoc networks.
  /*
   * Return a reference to the appropriate node for sending
   * a data frame.  This handles node discovery in adhoc networks.

-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_node.h madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_node.h
---- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_node.h   2007-04-04 04:39:58.000000000 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_node.h   2007-05-13 18:17:55.784088568 +0200
-@@ -318,6 +318,8 @@
+Index: madwifi-ng-r2834-20071106/net80211/ieee80211_node.h
+===================================================================
+--- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_node.h   2007-11-07 14:01:59.589347473 +0100
++++ madwifi-ng-r2834-20071106/net80211/ieee80211_node.h        2007-11-07 14:02:01.873477636 +0100
+@@ -328,6 +328,8 @@

        *pni = NULL;                    /* guard against use */
  }
  
        *pni = NULL;                    /* guard against use */
  }