xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mwifiex: report received management frames to cfg80211

Browse Source 
Process the management frames received from firmware and report
them to cfg80211.

Signed-off-by: Stone Piao <piaoyun@marvell.com>
Signed-off-by: Kiran Divekar <dkiran@marvell.com>
Signed-off-by: Kevin Gan <ganhy@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Stone Piao
2012-09-25 20:23:35 -07:00
committed by John W. Linville
parent 3cec68701a
commit 2dbaf751b1
6 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/mwifiex/fw.h
View File

@@ -94,6 +94,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
}; };
#define CAL_SNR(RSSI, NF) ((s16)((s16)(RSSI)-(s16)(NF))) #define CAL_SNR(RSSI, NF) ((s16)((s16)(RSSI)-(s16)(NF)))
#define CAL_RSSI(SNR, NF) ((s16)((s16)(SNR)+(s16)(NF)))
#define UAP_BSS_PARAMS_I 0 #define UAP_BSS_PARAMS_I 0
#define UAP_CUSTOM_IE_I 1 #define UAP_CUSTOM_IE_I 1

1
drivers/net/wireless/mwifiex/init.c
View File

@@ -214,6 +214,7 @@ static int mwifiex_init_priv(struct mwifiex_private *priv)
priv->wps_ie = NULL; priv->wps_ie = NULL;
priv->wps_ie_len = 0; priv->wps_ie_len = 0;
priv->ap_11n_enabled = 0; priv->ap_11n_enabled = 0;
priv->mgmt_rx_freq = 2437;
priv->scan_block = false; priv->scan_block = false;

4
drivers/net/wireless/mwifiex/main.h
View File

@@ -497,6 +497,7 @@ struct mwifiex_private {
struct timer_list scan_delay_timer; struct timer_list scan_delay_timer;
u8 ap_11n_enabled; u8 ap_11n_enabled;
u32 mgmt_frame_mask; u32 mgmt_frame_mask;
u32 mgmt_rx_freq;
}; };
enum mwifiex_ba_status { enum mwifiex_ba_status {
@@ -741,6 +742,9 @@ int mwifiex_dnld_fw(struct mwifiex_adapter *, struct mwifiex_fw_image *);
int mwifiex_recv_packet(struct mwifiex_adapter *, struct sk_buff *skb); int mwifiex_recv_packet(struct mwifiex_adapter *, struct sk_buff *skb);
int mwifiex_process_mgmt_packet(struct mwifiex_adapter *adapter,
struct sk_buff *skb);
int mwifiex_process_event(struct mwifiex_adapter *adapter); int mwifiex_process_event(struct mwifiex_adapter *adapter);
int mwifiex_complete_cmd(struct mwifiex_adapter *adapter, int mwifiex_complete_cmd(struct mwifiex_adapter *adapter,

6
drivers/net/wireless/mwifiex/sta_rx.c
View File

@@ -174,6 +174,12 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *adapter,
dev_err(adapter->dev, "Rx of A-MSDU failed"); dev_err(adapter->dev, "Rx of A-MSDU failed");
} }
return 0; return 0;
} else if (rx_pkt_type == PKT_TYPE_MGMT) {
ret = mwifiex_process_mgmt_packet(adapter, skb);
if (ret)
dev_err(adapter->dev, "Rx of mgmt packet failed");
dev_kfree_skb_any(skb);
return ret;
} }
/* /*

6
drivers/net/wireless/mwifiex/uap_txrx.c
View File

@@ -217,6 +217,12 @@ int mwifiex_process_uap_rx_packet(struct mwifiex_adapter *adapter,
} }
return 0; return 0;
} else if (rx_pkt_type == PKT_TYPE_MGMT) {
ret = mwifiex_process_mgmt_packet(adapter, skb);
if (ret)
dev_err(adapter->dev, "Rx of mgmt packet failed");
dev_kfree_skb_any(skb);
return ret;
} }
memcpy(ta, rx_pkt_hdr->eth803_hdr.h_source, ETH_ALEN); memcpy(ta, rx_pkt_hdr->eth803_hdr.h_source, ETH_ALEN);

40
drivers/net/wireless/mwifiex/util.c
View File

@@ -141,6 +141,46 @@ int mwifiex_get_debug_info(struct mwifiex_private *priv,
return 0; return 0;
} }
/*
* This function processes the received management packet and send it
* to the kernel.
*/
int
mwifiex_process_mgmt_packet(struct mwifiex_adapter *adapter,
struct sk_buff *skb)
{
struct rxpd *rx_pd;
struct mwifiex_private *priv;
u16 pkt_len;
if (!skb)
return -1;
rx_pd = (struct rxpd *)skb->data;
priv = mwifiex_get_priv_by_id(adapter, rx_pd->bss_num, rx_pd->bss_type);
if (!priv)
return -1;
skb_pull(skb, le16_to_cpu(rx_pd->rx_pkt_offset));
skb_pull(skb, sizeof(pkt_len));
pkt_len = le16_to_cpu(rx_pd->rx_pkt_length);
/* Remove address4 */
memmove(skb->data + sizeof(struct ieee80211_hdr_3addr),
skb->data + sizeof(struct ieee80211_hdr),
pkt_len - sizeof(struct ieee80211_hdr));
pkt_len -= ETH_ALEN + sizeof(pkt_len);
rx_pd->rx_pkt_length = cpu_to_le16(pkt_len);
cfg80211_rx_mgmt(priv->wdev, priv->mgmt_rx_freq,
CAL_RSSI(rx_pd->snr, rx_pd->nf),
skb->data, pkt_len, GFP_ATOMIC);
return 0;
}
/* /*
* This function processes the received packet before sending it to the * This function processes the received packet before sending it to the
* kernel. * kernel.