Skip to content

Commit

Permalink
[MAC80211]: split ieee80211_rx_h_check handler
Browse files Browse the repository at this point in the history
The ieee80211_rx_h_check handler really does two things, it's
a lot easier to understand if it's split into ieee80211_rx_h_check
and ieee80211_rx_h_load_key, and it may be possible in the future
to optimise the key loading to not do it for each interface.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Jiri Benc <jbenc@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Johannes Berg authored and David S. Miller committed Oct 10, 2007
1 parent 8e6f003 commit 570bd53
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion net/mac80211/rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ static ieee80211_txrx_result
ieee80211_rx_h_check(struct ieee80211_txrx_data *rx)
{
struct ieee80211_hdr *hdr;
int always_sta_key;
hdr = (struct ieee80211_hdr *) rx->skb->data;

/* Drop duplicate 802.11 retransmissions (IEEE 802.11 Chap. 9.2.9) */
Expand Down Expand Up @@ -302,6 +301,16 @@ ieee80211_rx_h_check(struct ieee80211_txrx_data *rx)
return TXRX_QUEUED;
}

return TXRX_CONTINUE;
}


static ieee80211_txrx_result
ieee80211_rx_h_load_key(struct ieee80211_txrx_data *rx)
{
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) rx->skb->data;
int always_sta_key;

if (rx->sdata->type == IEEE80211_IF_TYPE_STA)
always_sta_key = 0;
else
Expand Down Expand Up @@ -1208,6 +1217,7 @@ ieee80211_rx_handler ieee80211_rx_handlers[] =
ieee80211_rx_h_monitor,
ieee80211_rx_h_passive_scan,
ieee80211_rx_h_check,
ieee80211_rx_h_load_key,
ieee80211_rx_h_sta_process,
ieee80211_rx_h_ccmp_decrypt,
ieee80211_rx_h_tkip_decrypt,
Expand Down

0 comments on commit 570bd53

Please sign in to comment.