net: bcm63xx_enet: Utilize phy_ethtool_nway_reset

[linux.git] / net / mac80211 / tx.c

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 1c56abc496272bb58d71639975e4706c266f2066..62ccaf6f585d02198b997411dc622fc433b8a242 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -331,9 +331,8 @@ ieee80211_tx_h_check_assoc(struct ieee80211_tx_data *tx)
                        I802_DEBUG_INC(tx->local->tx_handlers_drop_not_assoc);
                        return TX_DROP;
                }
-       } else if (unlikely(tx->sdata->vif.type == NL80211_IFTYPE_AP &&
-                           ieee80211_is_data(hdr->frame_control) &&
-                           !atomic_read(&tx->sdata->u.ap.num_mcast_sta))) {
+       } else if (unlikely(ieee80211_is_data(hdr->frame_control) &&
+                           ieee80211_vif_get_num_mcast_if(tx->sdata) == 0)) {
                /*
                 * No associated STAs - no need to send multicast
                 * frames.
@@ -935,7 +934,7 @@ ieee80211_tx_h_fragment(struct ieee80211_tx_data *tx)
        if (info->flags & IEEE80211_TX_CTL_DONTFRAG)
                return TX_CONTINUE;
 
-       if (tx->local->ops->set_frag_threshold)
+       if (ieee80211_hw_check(&tx->local->hw, SUPPORTS_TX_FRAG))
                return TX_CONTINUE;
 
        /*
@@ -2801,7 +2800,7 @@ void ieee80211_check_fast_xmit(struct sta_info *sta)
 
        /* fast-xmit doesn't handle fragmentation at all */
        if (local->hw.wiphy->frag_threshold != (u32)-1 &&
-           !local->ops->set_frag_threshold)
+           !ieee80211_hw_check(&local->hw, SUPPORTS_TX_FRAG))
                goto out;
 
        rcu_read_lock();
@@ -3060,11 +3059,12 @@ static bool ieee80211_amsdu_prepare_head(struct ieee80211_sub_if_data *sdata,
        struct ieee80211_local *local = sdata->local;
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
        struct ieee80211_hdr *hdr;
-       struct ethhdr amsdu_hdr;
+       struct ethhdr *amsdu_hdr;
        int hdr_len = fast_tx->hdr_len - sizeof(rfc1042_header);
        int subframe_len = skb->len - hdr_len;
        void *data;
-       u8 *qc;
+       u8 *qc, *h_80211_src, *h_80211_dst;
+       const u8 *bssid;
 
        if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)
                return false;
@@ -3072,19 +3072,44 @@ static bool ieee80211_amsdu_prepare_head(struct ieee80211_sub_if_data *sdata,
        if (info->control.flags & IEEE80211_TX_CTRL_AMSDU)
                return true;
 
-       if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(amsdu_hdr),
+       if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(*amsdu_hdr),
                                         &subframe_len))
                return false;
 
-       amsdu_hdr.h_proto = cpu_to_be16(subframe_len);
-       memcpy(amsdu_hdr.h_source, skb->data + fast_tx->sa_offs, ETH_ALEN);
-       memcpy(amsdu_hdr.h_dest, skb->data + fast_tx->da_offs, ETH_ALEN);
+       data = skb_push(skb, sizeof(*amsdu_hdr));
+       memmove(data, data + sizeof(*amsdu_hdr), hdr_len);
+       hdr = data;
+       amsdu_hdr = data + hdr_len;
+       /* h_80211_src/dst is addr* field within hdr */
+       h_80211_src = data + fast_tx->sa_offs;
+       h_80211_dst = data + fast_tx->da_offs;
+
+       amsdu_hdr->h_proto = cpu_to_be16(subframe_len);
+       ether_addr_copy(amsdu_hdr->h_source, h_80211_src);
+       ether_addr_copy(amsdu_hdr->h_dest, h_80211_dst);
+
+       /* according to IEEE 802.11-2012 8.3.2 table 8-19, the outer SA/DA
+        * fields needs to be changed to BSSID for A-MSDU frames depending
+        * on FromDS/ToDS values.
+        */
+       switch (sdata->vif.type) {
+       case NL80211_IFTYPE_STATION:
+               bssid = sdata->u.mgd.bssid;
+               break;
+       case NL80211_IFTYPE_AP:
+       case NL80211_IFTYPE_AP_VLAN:
+               bssid = sdata->vif.addr;
+               break;
+       default:
+               bssid = NULL;
+       }
 
-       data = skb_push(skb, sizeof(amsdu_hdr));
-       memmove(data, data + sizeof(amsdu_hdr), hdr_len);
-       memcpy(data + hdr_len, &amsdu_hdr, sizeof(amsdu_hdr));
+       if (bssid && ieee80211_has_fromds(hdr->frame_control))
+               ether_addr_copy(h_80211_src, bssid);
+
+       if (bssid && ieee80211_has_tods(hdr->frame_control))
+               ether_addr_copy(h_80211_dst, bssid);
 
-       hdr = data;
        qc = ieee80211_get_qos_ctl(hdr);
        *qc |= IEEE80211_QOS_CTL_A_MSDU_PRESENT;