|
@@ -867,16 +867,18 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx)
|
|
|
{
|
|
|
struct ieee80211_hdr *hdr;
|
|
|
u16 sc;
|
|
|
+ __le16 fc;
|
|
|
unsigned int frag, seq;
|
|
|
struct ieee80211_fragment_entry *entry;
|
|
|
struct sk_buff *skb;
|
|
|
DECLARE_MAC_BUF(mac);
|
|
|
|
|
|
hdr = (struct ieee80211_hdr *)rx->skb->data;
|
|
|
+ fc = hdr->frame_control;
|
|
|
sc = le16_to_cpu(hdr->seq_ctrl);
|
|
|
frag = sc & IEEE80211_SCTL_FRAG;
|
|
|
|
|
|
- if (likely((!ieee80211_has_morefrags(hdr->frame_control) && frag == 0) ||
|
|
|
+ if (likely((!ieee80211_has_morefrags(fc) && frag == 0) ||
|
|
|
(rx->skb)->len < 24 ||
|
|
|
is_multicast_ether_addr(hdr->addr1))) {
|
|
|
/* not fragmented */
|
|
@@ -891,7 +893,7 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx)
|
|
|
entry = ieee80211_reassemble_add(rx->sdata, frag, seq,
|
|
|
rx->queue, &(rx->skb));
|
|
|
if (rx->key && rx->key->conf.alg == ALG_CCMP &&
|
|
|
- ieee80211_has_protected(hdr->frame_control)) {
|
|
|
+ ieee80211_has_protected(fc)) {
|
|
|
/* Store CCMP PN so that we can verify that the next
|
|
|
* fragment has a sequential PN value. */
|
|
|
entry->ccmp = 1;
|
|
@@ -930,11 +932,11 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx)
|
|
|
memcpy(entry->last_pn, pn, CCMP_PN_LEN);
|
|
|
}
|
|
|
|
|
|
- skb_pull(rx->skb, ieee80211_hdrlen(hdr->frame_control));
|
|
|
+ skb_pull(rx->skb, ieee80211_hdrlen(fc));
|
|
|
__skb_queue_tail(&entry->skb_list, rx->skb);
|
|
|
entry->last_frag = frag;
|
|
|
entry->extra_len += rx->skb->len;
|
|
|
- if (rx->fc & IEEE80211_FCTL_MOREFRAGS) {
|
|
|
+ if (ieee80211_has_morefrags(fc)) {
|
|
|
rx->skb = NULL;
|
|
|
return RX_QUEUED;
|
|
|
}
|
|
@@ -974,10 +976,9 @@ ieee80211_rx_h_ps_poll(struct ieee80211_rx_data *rx)
|
|
|
struct sk_buff *skb;
|
|
|
int no_pending_pkts;
|
|
|
DECLARE_MAC_BUF(mac);
|
|
|
+ __le16 fc = ((struct ieee80211_hdr *)rx->skb->data)->frame_control;
|
|
|
|
|
|
- if (likely(!rx->sta ||
|
|
|
- (rx->fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_CTL ||
|
|
|
- (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_PSPOLL ||
|
|
|
+ if (likely(!rx->sta || !ieee80211_is_pspoll(fc) ||
|
|
|
!(rx->flags & IEEE80211_RX_RA_MATCH)))
|
|
|
return RX_CONTINUE;
|
|
|
|
|
@@ -1073,7 +1074,7 @@ ieee80211_802_1x_port_control(struct ieee80211_rx_data *rx)
|
|
|
}
|
|
|
|
|
|
static int
|
|
|
-ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx)
|
|
|
+ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx, __le16 fc)
|
|
|
{
|
|
|
/*
|
|
|
* Pass through unencrypted frames if the hardware has
|
|
@@ -1083,9 +1084,8 @@ ieee80211_drop_unencrypted(struct ieee80211_rx_data *rx)
|
|
|
return 0;
|
|
|
|
|
|
/* Drop unencrypted frames if key is set. */
|
|
|
- if (unlikely(!(rx->fc & IEEE80211_FCTL_PROTECTED) &&
|
|
|
- (rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
|
|
|
- (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_NULLFUNC &&
|
|
|
+ if (unlikely(!ieee80211_has_protected(fc) &&
|
|
|
+ !ieee80211_is_nullfunc(fc) &&
|
|
|
(rx->key || rx->sdata->drop_unencrypted)))
|
|
|
return -EACCES;
|
|
|
|
|
@@ -1184,7 +1184,7 @@ ieee80211_data_to_8023(struct ieee80211_rx_data *rx)
|
|
|
/*
|
|
|
* requires that rx->skb is a frame with ethernet header
|
|
|
*/
|
|
|
-static bool ieee80211_frame_allowed(struct ieee80211_rx_data *rx)
|
|
|
+static bool ieee80211_frame_allowed(struct ieee80211_rx_data *rx, __le16 fc)
|
|
|
{
|
|
|
static const u8 pae_group_addr[ETH_ALEN] __aligned(2)
|
|
|
= { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x03 };
|
|
@@ -1200,7 +1200,7 @@ static bool ieee80211_frame_allowed(struct ieee80211_rx_data *rx)
|
|
|
return true;
|
|
|
|
|
|
if (ieee80211_802_1x_port_control(rx) ||
|
|
|
- ieee80211_drop_unencrypted(rx))
|
|
|
+ ieee80211_drop_unencrypted(rx, fc))
|
|
|
return false;
|
|
|
|
|
|
return true;
|
|
@@ -1270,20 +1270,21 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx)
|
|
|
{
|
|
|
struct net_device *dev = rx->dev;
|
|
|
struct ieee80211_local *local = rx->local;
|
|
|
- u16 fc, ethertype;
|
|
|
+ u16 ethertype;
|
|
|
u8 *payload;
|
|
|
struct sk_buff *skb = rx->skb, *frame = NULL;
|
|
|
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
|
|
|
+ __le16 fc = hdr->frame_control;
|
|
|
const struct ethhdr *eth;
|
|
|
int remaining, err;
|
|
|
u8 dst[ETH_ALEN];
|
|
|
u8 src[ETH_ALEN];
|
|
|
DECLARE_MAC_BUF(mac);
|
|
|
|
|
|
- fc = rx->fc;
|
|
|
- if (unlikely((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA))
|
|
|
+ if (unlikely(!ieee80211_is_data(fc)))
|
|
|
return RX_CONTINUE;
|
|
|
|
|
|
- if (unlikely(!WLAN_FC_DATA_PRESENT(fc)))
|
|
|
+ if (unlikely(!ieee80211_is_data_present(fc)))
|
|
|
return RX_DROP_MONITOR;
|
|
|
|
|
|
if (!(rx->flags & IEEE80211_RX_AMSDU))
|
|
@@ -1365,7 +1366,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx)
|
|
|
memcpy(skb_push(frame, ETH_ALEN), dst, ETH_ALEN);
|
|
|
}
|
|
|
|
|
|
- if (!ieee80211_frame_allowed(rx)) {
|
|
|
+ if (!ieee80211_frame_allowed(rx, fc)) {
|
|
|
if (skb == frame) /* last frame */
|
|
|
return RX_DROP_UNUSABLE;
|
|
|
dev_kfree_skb(frame);
|
|
@@ -1439,21 +1440,21 @@ static ieee80211_rx_result debug_noinline
|
|
|
ieee80211_rx_h_data(struct ieee80211_rx_data *rx)
|
|
|
{
|
|
|
struct net_device *dev = rx->dev;
|
|
|
- u16 fc;
|
|
|
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
|
|
|
+ __le16 fc = hdr->frame_control;
|
|
|
int err;
|
|
|
|
|
|
- fc = rx->fc;
|
|
|
- if (unlikely((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA))
|
|
|
+ if (unlikely(!ieee80211_is_data(hdr->frame_control)))
|
|
|
return RX_CONTINUE;
|
|
|
|
|
|
- if (unlikely(!WLAN_FC_DATA_PRESENT(fc)))
|
|
|
+ if (unlikely(!ieee80211_is_data_present(hdr->frame_control)))
|
|
|
return RX_DROP_MONITOR;
|
|
|
|
|
|
err = ieee80211_data_to_8023(rx);
|
|
|
if (unlikely(err))
|
|
|
return RX_DROP_UNUSABLE;
|
|
|
|
|
|
- if (!ieee80211_frame_allowed(rx))
|
|
|
+ if (!ieee80211_frame_allowed(rx, fc))
|
|
|
return RX_DROP_MONITOR;
|
|
|
|
|
|
rx->skb->dev = dev;
|
|
@@ -1818,13 +1819,12 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
|
|
|
struct ieee80211_sub_if_data *sdata;
|
|
|
struct ieee80211_hdr *hdr;
|
|
|
struct ieee80211_rx_data rx;
|
|
|
- u16 type;
|
|
|
int prepares;
|
|
|
struct ieee80211_sub_if_data *prev = NULL;
|
|
|
struct sk_buff *skb_new;
|
|
|
u8 *bssid;
|
|
|
|
|
|
- hdr = (struct ieee80211_hdr *) skb->data;
|
|
|
+ hdr = (struct ieee80211_hdr *)skb->data;
|
|
|
memset(&rx, 0, sizeof(rx));
|
|
|
rx.skb = skb;
|
|
|
rx.local = local;
|
|
@@ -1832,9 +1832,8 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
|
|
|
rx.status = status;
|
|
|
rx.rate = rate;
|
|
|
rx.fc = le16_to_cpu(hdr->frame_control);
|
|
|
- type = rx.fc & IEEE80211_FCTL_FTYPE;
|
|
|
|
|
|
- if (type == IEEE80211_FTYPE_DATA || type == IEEE80211_FTYPE_MGMT)
|
|
|
+ if (ieee80211_is_data(hdr->frame_control) || ieee80211_is_mgmt(hdr->frame_control))
|
|
|
local->dot11ReceivedFragmentCount++;
|
|
|
|
|
|
rx.sta = sta_info_get(local, hdr->addr2);
|