Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 214871
b: refs/heads/master
c: 4406c37
h: refs/heads/master
i:
  214869: acf618f
  214867: 12910ef
  214863: 5d56cd6
v: v3
  • Loading branch information
Johannes Berg authored and John W. Linville committed Sep 27, 2010
1 parent 2e4757e commit 082f05d
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 104 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 20b01f80f72426e7ed2e773220da4357925383d5
refs/heads/master: 4406c376895608375105013bf405ecac720ef558
165 changes: 62 additions & 103 deletions trunk/net/mac80211/rx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2443,18 +2443,13 @@ static void ieee80211_rx_handlers(struct ieee80211_rx_data *rx,
}
}

static void ieee80211_invoke_rx_handlers(struct ieee80211_sub_if_data *sdata,
struct ieee80211_rx_data *rx,
struct sk_buff *skb)
static void ieee80211_invoke_rx_handlers(struct ieee80211_rx_data *rx)
{
struct sk_buff_head reorder_release;
ieee80211_rx_result res = RX_DROP_MONITOR;

__skb_queue_head_init(&reorder_release);

rx->skb = skb;
rx->sdata = sdata;

#define CALL_RXH(rxh) \
do { \
res = rxh(rx); \
Expand Down Expand Up @@ -2597,22 +2592,64 @@ static int prepare_for_handlers(struct ieee80211_rx_data *rx,
return 1;
}

/*
* This function returns whether or not the SKB
* was destined for RX processing or not, which,
* if consume is true, is equivalent to whether
* or not the skb was consumed.
*/
static bool ieee80211_prepare_and_rx_handle(struct ieee80211_rx_data *rx,
struct sk_buff *skb, bool consume)
{
struct ieee80211_local *local = rx->local;
struct ieee80211_sub_if_data *sdata = rx->sdata;
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
struct ieee80211_hdr *hdr = (void *)skb->data;
int prepares;

rx->skb = skb;
rx->flags |= IEEE80211_RX_RA_MATCH;
prepares = prepare_for_handlers(rx, hdr);

if (!prepares)
return false;

if (status->flag & RX_FLAG_MMIC_ERROR) {
if (rx->flags & IEEE80211_RX_RA_MATCH)
ieee80211_rx_michael_mic_report(hdr, rx);
return false;
}

if (!consume) {
skb = skb_copy(skb, GFP_ATOMIC);
if (!skb) {
if (net_ratelimit())
wiphy_debug(local->hw.wiphy,
"failed to copy multicast frame for %s\n",
sdata->name);
return true;
}

rx->skb = skb;
}

ieee80211_invoke_rx_handlers(rx);
return true;
}

/*
* This is the actual Rx frames handler. as it blongs to Rx path it must
* be called with rcu_read_lock protection.
*/
static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
struct sk_buff *skb)
{
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
struct ieee80211_local *local = hw_to_local(hw);
struct ieee80211_sub_if_data *sdata;
struct ieee80211_hdr *hdr;
__le16 fc;
struct ieee80211_rx_data rx;
int prepares;
struct ieee80211_sub_if_data *prev = NULL;
struct sk_buff *skb_new;
struct ieee80211_sub_if_data *prev;
struct sta_info *sta, *tmp, *prev_sta;
bool found_sta = false;
int err = 0;
Expand Down Expand Up @@ -2645,74 +2682,34 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,

if (ieee80211_is_data(fc)) {
prev_sta = NULL;

for_each_sta_info(local, hdr->addr2, sta, tmp) {
found_sta = true;

if (!prev_sta) {
prev_sta = sta;
continue;
}

rx.sta = prev_sta;
rx.sdata = prev_sta->sdata;
ieee80211_prepare_and_rx_handle(&rx, skb, false);

rx.flags |= IEEE80211_RX_RA_MATCH;
prepares = prepare_for_handlers(&rx, hdr);
if (!prepares)
goto next_sta;

if (status->flag & RX_FLAG_MMIC_ERROR) {
if (rx.flags & IEEE80211_RX_RA_MATCH)
ieee80211_rx_michael_mic_report(hdr, &rx);
goto next_sta;
}

/*
* frame was destined for the previous interface
* so invoke RX handlers for it
*/
skb_new = skb_copy(skb, GFP_ATOMIC);
if (!skb_new) {
if (net_ratelimit())
wiphy_debug(local->hw.wiphy,
"failed to copy multicast"
" frame for %s\n",
prev_sta->sdata->name);
goto next_sta;
}
ieee80211_invoke_rx_handlers(prev_sta->sdata, &rx,
skb_new);
next_sta:
prev_sta = sta;
} /* for all STA info */
}

if (prev_sta) {
rx.sta = prev_sta;
rx.sdata = prev_sta->sdata;

rx.flags |= IEEE80211_RX_RA_MATCH;
prepares = prepare_for_handlers(&rx, hdr);
if (!prepares)
prev_sta = NULL;

if (prev_sta && status->flag & RX_FLAG_MMIC_ERROR) {
if (rx.flags & IEEE80211_RX_RA_MATCH)
ieee80211_rx_michael_mic_report(hdr, &rx);
prev_sta = NULL;
}
}


if (prev_sta) {
ieee80211_invoke_rx_handlers(prev_sta->sdata, &rx, skb);
return;
} else {
if (found_sta) {
dev_kfree_skb(skb);
if (ieee80211_prepare_and_rx_handle(&rx, skb, true))
return;
}
}
} /* if data frame */
}

if (!found_sta) {
prev = NULL;

list_for_each_entry_rcu(sdata, &local->interfaces, list) {
if (!ieee80211_sdata_running(sdata))
continue;
Expand All @@ -2734,60 +2731,22 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,

rx.sta = sta_info_get_bss(prev, hdr->addr2);
rx.sdata = prev;
ieee80211_prepare_and_rx_handle(&rx, skb, false);

rx.flags |= IEEE80211_RX_RA_MATCH;
prepares = prepare_for_handlers(&rx, hdr);

if (!prepares)
goto next;

if (status->flag & RX_FLAG_MMIC_ERROR) {
if (rx.flags & IEEE80211_RX_RA_MATCH)
ieee80211_rx_michael_mic_report(hdr,
&rx);
goto next;
}

/*
* frame was destined for the previous interface
* so invoke RX handlers for it
*/

skb_new = skb_copy(skb, GFP_ATOMIC);
if (!skb_new) {
if (net_ratelimit())
wiphy_debug(local->hw.wiphy,
"failed to copy multicast frame for %s\n",
prev->name);
goto next;
}
ieee80211_invoke_rx_handlers(prev, &rx, skb_new);
next:
prev = sdata;
}

if (prev) {
rx.sta = sta_info_get_bss(prev, hdr->addr2);
rx.sdata = prev;

rx.flags |= IEEE80211_RX_RA_MATCH;
prepares = prepare_for_handlers(&rx, hdr);

if (!prepares)
prev = NULL;

if (prev && status->flag & RX_FLAG_MMIC_ERROR) {
if (rx.flags & IEEE80211_RX_RA_MATCH)
ieee80211_rx_michael_mic_report(hdr,
&rx);
prev = NULL;
}
if (ieee80211_prepare_and_rx_handle(&rx, skb, true))
return;
}

}
if (prev)
ieee80211_invoke_rx_handlers(prev, &rx, skb);
else
dev_kfree_skb(skb);

dev_kfree_skb(skb);
}

/*
Expand Down

0 comments on commit 082f05d

Please sign in to comment.