diff options
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 9972e07a2f96..4105d0ca963e 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -398,13 +398,14 @@ ieee80211_tx_h_multicast_ps_buf(struct ieee80211_tx_data *tx) | |||
398 | if (ieee80211_has_order(hdr->frame_control)) | 398 | if (ieee80211_has_order(hdr->frame_control)) |
399 | return TX_CONTINUE; | 399 | return TX_CONTINUE; |
400 | 400 | ||
401 | if (tx->local->hw.flags & IEEE80211_HW_QUEUE_CONTROL) | ||
402 | info->hw_queue = tx->sdata->vif.cab_queue; | ||
403 | |||
401 | /* no stations in PS mode */ | 404 | /* no stations in PS mode */ |
402 | if (!atomic_read(&ps->num_sta_ps)) | 405 | if (!atomic_read(&ps->num_sta_ps)) |
403 | return TX_CONTINUE; | 406 | return TX_CONTINUE; |
404 | 407 | ||
405 | info->flags |= IEEE80211_TX_CTL_SEND_AFTER_DTIM; | 408 | info->flags |= IEEE80211_TX_CTL_SEND_AFTER_DTIM; |
406 | if (tx->local->hw.flags & IEEE80211_HW_QUEUE_CONTROL) | ||
407 | info->hw_queue = tx->sdata->vif.cab_queue; | ||
408 | 409 | ||
409 | /* device releases frame after DTIM beacon */ | 410 | /* device releases frame after DTIM beacon */ |
410 | if (!(tx->local->hw.flags & IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING)) | 411 | if (!(tx->local->hw.flags & IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING)) |
@@ -1789,12 +1790,6 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, | |||
1789 | break; | 1790 | break; |
1790 | #ifdef CONFIG_MAC80211_MESH | 1791 | #ifdef CONFIG_MAC80211_MESH |
1791 | case NL80211_IFTYPE_MESH_POINT: | 1792 | case NL80211_IFTYPE_MESH_POINT: |
1792 | if (!sdata->u.mesh.mshcfg.dot11MeshTTL) { | ||
1793 | /* Do not send frames with mesh_ttl == 0 */ | ||
1794 | sdata->u.mesh.mshstats.dropped_frames_ttl++; | ||
1795 | goto fail_rcu; | ||
1796 | } | ||
1797 | |||
1798 | if (!is_multicast_ether_addr(skb->data)) { | 1793 | if (!is_multicast_ether_addr(skb->data)) { |
1799 | struct sta_info *next_hop; | 1794 | struct sta_info *next_hop; |
1800 | bool mpp_lookup = true; | 1795 | bool mpp_lookup = true; |