1 Index: madwifi/net80211/ieee80211_wireless.c
2 ===================================================================
3 --- madwifi/net80211/ieee80211_wireless.c (revision 2482)
4 +++ madwifi/net80211/ieee80211_wireless.c (revision 2484)
6 for (i = 0; i < number; i++) {
7 ni = ieee80211_find_node(nt, &vap->iv_spy.mac[i * IEEE80211_ADDR_LEN]);
8 - /* TODO: free node ? */
9 /* check we are associated w/ this vap */
10 if (ni && (ni->ni_vap == vap)) {
12 spy_stat[i].updated = IW_QUAL_ALL_INVALID;
14 + ieee80211_unref_node(&ni);
18 if (ik->ik_keylen > sizeof(ik->ik_keydata))
22 if (kix == IEEE80211_KEYIX_NONE) {
24 ik->ik_flags |= IEEE80211_KEY_GROUP; /* XXX */
28 flags = ik->ik_flags & IEEE80211_KEY_COMMON;
30 memcpy(wk->wk_key, ik->ik_keydata, ik->ik_keylen);
31 if (!ieee80211_crypto_setkey(vap, wk,
32 - ni != NULL ? ni->ni_macaddr : ik->ik_macaddr, ni))
33 + (ni != NULL) ? ni->ni_macaddr : ik->ik_macaddr, ni))
35 else if ((ik->ik_flags & IEEE80211_KEY_DEFAULT))
40 ieee80211_key_update_end(vap);
42 Index: madwifi/net80211/ieee80211_output.c
43 ===================================================================
44 --- madwifi/net80211/ieee80211_output.c (revision 2438)
45 +++ madwifi/net80211/ieee80211_output.c (revision 2484)
48 ieee80211_pwrsave(ni, skb);
49 + ieee80211_unref_node(&ni);
54 ni = ieee80211_find_txnode(vap->iv_xrvap, eh->ether_dhost);
55 - skb1 = skb_clone(skb,GFP_ATOMIC);
56 + skb1 = skb_clone(skb, GFP_ATOMIC);
58 cb = (struct ieee80211_cb *) skb1->cb;
59 Index: madwifi/ath/if_ath.c
60 ===================================================================
61 --- madwifi/ath/if_ath.c (revision 2482)
62 +++ madwifi/ath/if_ath.c (revision 2484)
63 @@ -8111,14 +8111,13 @@
64 /* Depending on the sequence of bringing up devices
65 * it's possible the rates of the root bss isn't
68 - if (vap->iv_ic->ic_newassoc != NULL &&
69 - wds_ni->ni_rates.rs_nrates != 0) {
71 + if ((vap->iv_ic->ic_newassoc != NULL) &&
72 + (wds_ni->ni_rates.rs_nrates != 0)) {
73 /* Fill in the rates based on our own rates
74 * we rely on the rate selection mechanism
75 - * to find out which rates actually work!
77 + * to find out which rates actually work! */
78 vap->iv_ic->ic_newassoc(wds_ni, 1);
80 + ieee80211_unref_node(&wds_ni);