package/madwifi/patches/112-keycache_PR_962.patch

   1 Index: madwifi-ng-r2834-20071106/ath/if_ath.c
   2 ===================================================================
   3 --- madwifi-ng-r2834-20071106.orig/ath/if_ath.c 2007-11-07 14:02:00.957425434 +0100
   4 +++ madwifi-ng-r2834-20071106/ath/if_ath.c      2007-11-07 14:02:01.785472625 +0100
   5 @@ -5853,7 +5853,8 @@
   6                  * frame; it'll be dropped where it's not wanted.
   7                  */
   8                 if (rs->rs_keyix != HAL_RXKEYIX_INVALID &&
   9 -                   (ni = sc->sc_keyixmap[rs->rs_keyix]) != NULL) {
  10 +                   ((ni = sc->sc_keyixmap[rs->rs_keyix]) != NULL) &&
  11 +                       ieee80211_check_rxnode(ni, (const struct ieee80211_frame_min *) skb->data)) {
  12                         struct ath_node *an;
  13                         /*
  14                          * Fast path: node is present in the key map;
  15 Index: madwifi-ng-r2834-20071106/net80211/ieee80211_node.c
  16 ===================================================================
  17 --- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_node.c    2007-11-07 14:01:59.581347018 +0100
  18 +++ madwifi-ng-r2834-20071106/net80211/ieee80211_node.c 2007-11-07 14:02:01.789472851 +0100
  19 @@ -1290,8 +1290,6 @@
  20         IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
  21
  22         return ni;
  23 -#undef IS_PSPOLL
  24 -#undef IS_CTL
  25  }
  26  #ifdef IEEE80211_DEBUG_REFCNT
  27  EXPORT_SYMBOL(ieee80211_find_rxnode_debug);
  28 @@ -1299,6 +1297,20 @@
  29  EXPORT_SYMBOL(ieee80211_find_rxnode);
  30  #endif
  31
  32 +int
  33 +ieee80211_check_rxnode(struct ieee80211_node *ni,
  34 +       const struct ieee80211_frame_min *wh)
  35 +{
  36 +       if (IS_CTL(wh) && !IS_PSPOLL(wh) /*&& !IS_RTS(ah)*/)
  37 +               return IEEE80211_ADDR_EQ(ni->ni_macaddr, wh->i_addr1);
  38 +       else
  39 +               return IEEE80211_ADDR_EQ(ni->ni_macaddr, wh->i_addr2);
  40 +}
  41 +
  42 +EXPORT_SYMBOL(ieee80211_check_rxnode);
  43 +#undef IS_PSPOLL
  44 +#undef IS_CTL
  45 +
  46  /*
  47   * Return a reference to the appropriate node for sending
  48   * a data frame.  This handles node discovery in adhoc networks.
  49 Index: madwifi-ng-r2834-20071106/net80211/ieee80211_node.h
  50 ===================================================================
  51 --- madwifi-ng-r2834-20071106.orig/net80211/ieee80211_node.h    2007-11-07 14:01:59.589347473 +0100
  52 +++ madwifi-ng-r2834-20071106/net80211/ieee80211_node.h 2007-11-07 14:02:01.873477636 +0100
  53 @@ -328,6 +328,8 @@
  54         *pni = NULL;                    /* guard against use */
  55  }
  56
  57 +int ieee80211_check_rxnode(struct ieee80211_node *ni,
  58 +       const struct ieee80211_frame_min *wh);
  59  int ieee80211_add_wds_addr(struct ieee80211_node_table *, struct ieee80211_node *,
  60         const u_int8_t *, u_int8_t);
  61  void ieee80211_remove_wds_addr(struct ieee80211_node_table *, const u_int8_t *);