Skip to content

Commit

Permalink
mac80211: clean up/rename prepare_for_handlers()
Browse files Browse the repository at this point in the history 
The function really shouldn't be called prepare_for_handlers(),
all it does is check if the frame should be dropped. Rename it
to ieee80211_accept_frame() and clean it up a bit.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Johannes Berg committed Apr 24, 2015
1 parent 5c90067 commit a58fbe1
Showing 1 changed file with 36 additions and 44 deletions.
80 changes: 36 additions & 44 deletions net/mac80211/rx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3223,11 +3223,11 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid)

/* main receive path */

static bool prepare_for_handlers(struct ieee80211_rx_data *rx,
struct ieee80211_hdr *hdr)
static bool ieee80211_accept_frame(struct ieee80211_rx_data *rx)
{
struct ieee80211_sub_if_data *sdata = rx->sdata;
struct sk_buff *skb = rx->skb;
struct ieee80211_hdr *hdr = (void *)skb->data;
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
u8 *bssid = ieee80211_get_bssid(hdr, skb->len, sdata->vif.type);
int multicast = is_multicast_ether_addr(hdr->addr1);
Expand All @@ -3236,24 +3236,23 @@ static bool prepare_for_handlers(struct ieee80211_rx_data *rx,
case NL80211_IFTYPE_STATION:
if (!bssid && !sdata->u.mgd.use_4addr)
return false;
if (!multicast &&
!ether_addr_equal(sdata->vif.addr, hdr->addr1))
return false;
break;
if (multicast)
return true;
return ether_addr_equal(sdata->vif.addr, hdr->addr1);
case NL80211_IFTYPE_ADHOC:
if (!bssid)
return false;
if (ether_addr_equal(sdata->vif.addr, hdr->addr2) ||
ether_addr_equal(sdata->u.ibss.bssid, hdr->addr2))
return false;
if (ieee80211_is_beacon(hdr->frame_control)) {
if (ieee80211_is_beacon(hdr->frame_control))
return true;
} else if (!ieee80211_bssid_match(bssid, sdata->u.ibss.bssid)) {
if (!ieee80211_bssid_match(bssid, sdata->u.ibss.bssid))
return false;
} else if (!multicast &&
!ether_addr_equal(sdata->vif.addr, hdr->addr1)) {
if (!multicast &&
!ether_addr_equal(sdata->vif.addr, hdr->addr1))
return false;
} else if (!rx->sta) {
if (!rx->sta) {
int rate_idx;
if (status->flag & (RX_FLAG_HT | RX_FLAG_VHT))
rate_idx = 0; /* TODO: HT/VHT rates */
Expand All @@ -3262,20 +3261,18 @@ static bool prepare_for_handlers(struct ieee80211_rx_data *rx,
ieee80211_ibss_rx_no_sta(sdata, bssid, hdr->addr2,
BIT(rate_idx));
}
break;
return true;
case NL80211_IFTYPE_OCB:
if (!bssid)
return false;
if (ieee80211_is_beacon(hdr->frame_control)) {
if (ieee80211_is_beacon(hdr->frame_control))
return false;
} else if (!is_broadcast_ether_addr(bssid)) {
ocb_dbg(sdata, "BSSID mismatch in OCB mode!\n");
if (!is_broadcast_ether_addr(bssid))
return false;
} else if (!multicast &&
!ether_addr_equal(sdata->dev->dev_addr,
hdr->addr1)) {
if (!multicast &&
!ether_addr_equal(sdata->dev->dev_addr, hdr->addr1))
return false;
} else if (!rx->sta) {
if (!rx->sta) {
int rate_idx;
if (status->flag & RX_FLAG_HT)
rate_idx = 0; /* TODO: HT rates */
Expand All @@ -3284,18 +3281,17 @@ static bool prepare_for_handlers(struct ieee80211_rx_data *rx,
ieee80211_ocb_rx_no_sta(sdata, bssid, hdr->addr2,
BIT(rate_idx));
}
break;
return true;
case NL80211_IFTYPE_MESH_POINT:
if (!multicast &&
!ether_addr_equal(sdata->vif.addr, hdr->addr1))
return false;
break;
if (multicast)
return true;
return ether_addr_equal(sdata->vif.addr, hdr->addr1);
case NL80211_IFTYPE_AP_VLAN:
case NL80211_IFTYPE_AP:
if (!bssid) {
if (!ether_addr_equal(sdata->vif.addr, hdr->addr1))
return false;
} else if (!ieee80211_bssid_match(bssid, sdata->vif.addr)) {
if (!bssid)
return ether_addr_equal(sdata->vif.addr, hdr->addr1);

if (!ieee80211_bssid_match(bssid, sdata->vif.addr)) {
/*
* Accept public action frames even when the
* BSSID doesn't match, this is used for P2P
Expand All @@ -3308,7 +3304,9 @@ static bool prepare_for_handlers(struct ieee80211_rx_data *rx,
if (ieee80211_is_public_action(hdr, skb->len))
return true;
return ieee80211_is_beacon(hdr->frame_control);
} else if (!ieee80211_has_tods(hdr->frame_control)) {
}

if (!ieee80211_has_tods(hdr->frame_control)) {
/* ignore data frames to TDLS-peers */
if (ieee80211_is_data(hdr->frame_control))
return false;
Expand All @@ -3317,27 +3315,22 @@ static bool prepare_for_handlers(struct ieee80211_rx_data *rx,
!ether_addr_equal(bssid, hdr->addr1))
return false;
}
break;
return true;
case NL80211_IFTYPE_WDS:
if (bssid || !ieee80211_is_data(hdr->frame_control))
return false;
if (!ether_addr_equal(sdata->u.wds.remote_addr, hdr->addr2))
return false;
break;
return ether_addr_equal(sdata->u.wds.remote_addr, hdr->addr2);
case NL80211_IFTYPE_P2P_DEVICE:
if (!ieee80211_is_public_action(hdr, skb->len) &&
!ieee80211_is_probe_req(hdr->frame_control) &&
!ieee80211_is_probe_resp(hdr->frame_control) &&
!ieee80211_is_beacon(hdr->frame_control))
return false;
break;
return ieee80211_is_public_action(hdr, skb->len) ||
ieee80211_is_probe_req(hdr->frame_control) ||
ieee80211_is_probe_resp(hdr->frame_control) ||
ieee80211_is_beacon(hdr->frame_control);
default:
/* should never get here */
WARN_ON_ONCE(1);
break;
}

return true;
WARN_ON_ONCE(1);
return false;
}

/*
Expand All @@ -3351,11 +3344,10 @@ static bool ieee80211_prepare_and_rx_handle(struct ieee80211_rx_data *rx,
{
struct ieee80211_local *local = rx->local;
struct ieee80211_sub_if_data *sdata = rx->sdata;
struct ieee80211_hdr *hdr = (void *)skb->data;

rx->skb = skb;

if (!prepare_for_handlers(rx, hdr))
if (!ieee80211_accept_frame(rx))
return false;

if (!consume) {
Expand Down

0 comments on commit a58fbe1

Please sign in to comment.