Merge tag 'wireless-drivers-next-for-davem-2015-06-18' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
Major changes:

mwifiex:

* enhancements for AP mode: support verbose information in station
  dump command and also information about AP link.
* enable power save by default

brcmfmac:

* fix module reload issue for PCIe
* improving msgbuf protocol for PCIe devices
* rework .get_station() cfg80211 callback operation
* determine interface combinations upon device feature support

ath9k:

* ath9k_htc: add support of channel switch

wil6210:

* add modparam for bcast ring size
* support hidden SSID
* add per-MCS Rx stats
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 42 insertions, 14 deletions

diff --git a/drivers/net/wireless/mwifiex/util.c b/drivers/net/wireless/mwifiex/util.c
index 370323a47ecb..790e61953abf 100644
--- a/drivers/net/wireless/mwifiex/util.c
+++ b/drivers/net/wireless/mwifiex/util.c
@@ -329,7 +329,7 @@ mwifiex_parse_mgmt_packet(struct mwifiex_private *priv, u8 *payload, u16 len,
                           struct rxpd *rx_pd)
 {
         u16 stype;
-        u8 category, action_code;
+        u8 category, action_code, *addr2;
         struct ieee80211_hdr *ieee_hdr = (void *)payload;
 
         stype = (le16_to_cpu(ieee_hdr->frame_control) & IEEE80211_FCTL_STYPE);
@@ -337,21 +337,35 @@ mwifiex_parse_mgmt_packet(struct mwifiex_private *priv, u8 *payload, u16 len,
         switch (stype) {
         case IEEE80211_STYPE_ACTION:
                 category = *(payload + sizeof(struct ieee80211_hdr));
-                action_code = *(payload + sizeof(struct ieee80211_hdr) + 1);
-                if (category == WLAN_CATEGORY_PUBLIC &&
-                    action_code == WLAN_PUB_ACTION_TDLS_DISCOVER_RES) {
+                switch (category) {
+                case WLAN_CATEGORY_PUBLIC:
+                        action_code = *(payload + sizeof(struct ieee80211_hdr)
+                                        + 1);
+                        if (action_code == WLAN_PUB_ACTION_TDLS_DISCOVER_RES) {
+                                addr2 = ieee_hdr->addr2;
+                                mwifiex_dbg(priv->adapter, INFO,
+                                            "TDLS discovery response %pM nf=%d, snr=%d\n",
+                                            addr2, rx_pd->nf, rx_pd->snr);
+                                mwifiex_auto_tdls_update_peer_signal(priv,
+                                                                     addr2,
+                                                                     rx_pd->snr,
+                                                                     rx_pd->nf);
+                        }
+                        break;
+                case WLAN_CATEGORY_BACK:
+                        /*we dont indicate BACK action frames to cfg80211*/
+                        mwifiex_dbg(priv->adapter, INFO,
+                                    "drop BACK action frames");
+                        return -1;
+                default:
                         mwifiex_dbg(priv->adapter, INFO,
-                                    "TDLS discovery response %pM nf=%d, snr=%d\n",
-                                    ieee_hdr->addr2, rx_pd->nf, rx_pd->snr);
-                        mwifiex_auto_tdls_update_peer_signal(priv,
-                                                             ieee_hdr->addr2,
-                                                             rx_pd->snr,
-                                                             rx_pd->nf);
+                                    "unknown public action frame category %d\n",
+                                    category);
                 }
-                break;
         default:
                 mwifiex_dbg(priv->adapter, INFO,
-                            "unknown mgmt frame subtype %#x\n", stype);
+                    "unknown mgmt frame subtype %#x\n", stype);
+                return 0;
         }
 
         return 0;
@@ -387,8 +401,9 @@ mwifiex_process_mgmt_packet(struct mwifiex_private *priv,
 
         ieee_hdr = (void *)skb->data;
         if (ieee80211_is_mgmt(ieee_hdr->frame_control)) {
-                mwifiex_parse_mgmt_packet(priv, (u8 *)ieee_hdr,
-                                          pkt_len, rx_pd);
+                if (mwifiex_parse_mgmt_packet(priv, (u8 *)ieee_hdr,
+                                              pkt_len, rx_pd))
+                        return -1;
         }
         /* Remove address4 */
         memmove(skb->data + sizeof(struct ieee80211_hdr_3addr),
@@ -416,12 +431,25 @@ mwifiex_process_mgmt_packet(struct mwifiex_private *priv,
  */
 int mwifiex_recv_packet(struct mwifiex_private *priv, struct sk_buff *skb)
 {
+        struct mwifiex_sta_node *src_node;
+        struct ethhdr *p_ethhdr;
+
         if (!skb)
                 return -1;
 
         priv->stats.rx_bytes += skb->len;
         priv->stats.rx_packets++;
 
+        if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP) {
+                p_ethhdr = (void *)skb->data;
+                src_node = mwifiex_get_sta_entry(priv, p_ethhdr->h_source);
+                if (src_node) {
+                        src_node->stats.last_rx = jiffies;
+                        src_node->stats.rx_bytes += skb->len;
+                        src_node->stats.rx_packets++;
+                }
+        }
+
         skb->dev = priv->netdev;
         skb->protocol = eth_type_trans(skb, priv->netdev);
         skb->ip_summed = CHECKSUM_NONE;