[Madwifi-cvs] revision 3672 committed
Status: Beta
Brought to you by:
otaku
From: Matthew W. S. B. <svn...@ma...> - 2008-05-22 15:13:30
|
Project : madwifi Revision : 3672 Author : mentor (Matthew W. S. Bell) Date : 2008-05-22 17:13:19 +0200 (Thu, 22 May 2008) Log Message : Slightly tidier way of managing SKBs Affected Files: * madwifi/trunk/ath/if_ath.c updated Modified: madwifi/trunk/ath/if_ath.c =================================================================== --- madwifi/trunk/ath/if_ath.c 2008-05-22 13:52:29 UTC (rev 3671) +++ madwifi/trunk/ath/if_ath.c 2008-05-22 15:13:19 UTC (rev 3672) @@ -6504,7 +6504,7 @@ struct ath_desc *ds; struct ath_rx_status *rs; struct ieee80211_node *ni; - struct sk_buff* skb; + struct sk_buff* skb = NULL; unsigned int len, phyerr, mic_fail = 0; int type = -1; /* undefined */ int init_ret = 0; @@ -6629,17 +6629,15 @@ /* Finished monitor mode handling, now reject error frames * before passing to other VAPs. Ignore MIC failures here, as * we need to recheck them. */ - if (rs->rs_status & ~(HAL_RXERR_MIC | HAL_RXERR_DECRYPT)) { - ieee80211_dev_kfree_skb(&skb); + if (rs->rs_status & ~(HAL_RXERR_MIC | HAL_RXERR_DECRYPT)) goto rx_next; - } /* Remove the CRC. */ skb_trim(skb, skb->len - IEEE80211_CRC_LEN); if (mic_fail) { - struct ieee80211_frame *frm = (struct ieee80211_frame *) - skb->data; + struct ieee80211_frame *frm = + (struct ieee80211_frame *)skb->data; /* Ignore control frames which are reported with MIC * error. */ if ((frm->i_fc[0] & IEEE80211_FC0_TYPE_MASK) != @@ -6654,8 +6652,6 @@ } mic_fail = 0; - - ieee80211_dev_kfree_skb(&skb); goto rx_next; } @@ -6666,7 +6662,6 @@ len); sc->sc_stats.ast_rx_tooshort++; errors++; - ieee80211_dev_kfree_skb(&skb); goto rx_next; } @@ -6736,7 +6731,7 @@ type = ieee80211_input_all(ic, skb, rs->rs_rssi, bf->bf_tsf); } - skb = NULL; + skb = NULL; /* SKB is no longer ours. */ if (sc->sc_diversity) { /* When using hardware fast diversity, change the default RX @@ -6761,6 +6756,9 @@ ath_led_event(sc, ATH_LED_POLL); } rx_next: + /* SKBs that have not in a buf, and are not passed on. */ + ieee80211_dev_kfree_skb(&skb); + KASSERT(bf != NULL, ("null bf")); if ((init_ret = ath_rxbuf_init(sc, bf)) != 0) { |