forked from Minki/linux
mac80211: simplify mesh frame queue mapping and QoS
We only need to set the skb queue twice: 1. by the netdev, on local TX. 2. when forwarding a mesh frame. We only need to set the qos header twice: 1. by mac80211, on local TX. 2. when putting a frame on the mpath->frame_queue We also don't need the RA in order to set the proper queue mapping since all mesh STAs are QoS, indicate this and do it once when the frame is received. Also fixes an issue where the QoS header and queue mapping was not set for unicast forwarded frames. Signed-off-by: Javier Cardona <javier@cozybit.com> Signed-off-by: Thomas Pedersen <thomas@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
660c6a449a
commit
d0ce1855ea
@ -1043,6 +1043,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,
|
||||
skb_to_free = skb_dequeue(&mpath->frame_queue);
|
||||
|
||||
info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
|
||||
ieee80211_set_qos_hdr(sdata, skb);
|
||||
skb_queue_tail(&mpath->frame_queue, skb);
|
||||
if (skb_to_free)
|
||||
mesh_path_discard_frame(skb_to_free, sdata);
|
||||
|
@ -213,7 +213,6 @@ void mesh_path_assign_nexthop(struct mesh_path *mpath, struct sta_info *sta)
|
||||
struct ieee80211_hdr *hdr;
|
||||
struct sk_buff_head tmpq;
|
||||
unsigned long flags;
|
||||
struct ieee80211_sub_if_data *sdata = mpath->sdata;
|
||||
|
||||
rcu_assign_pointer(mpath->next_hop, sta);
|
||||
|
||||
@ -224,8 +223,6 @@ void mesh_path_assign_nexthop(struct mesh_path *mpath, struct sta_info *sta)
|
||||
while ((skb = __skb_dequeue(&mpath->frame_queue)) != NULL) {
|
||||
hdr = (struct ieee80211_hdr *) skb->data;
|
||||
memcpy(hdr->addr1, sta->sta.addr, ETH_ALEN);
|
||||
skb_set_queue_mapping(skb, ieee80211_select_queue(sdata, skb));
|
||||
ieee80211_set_qos_hdr(sdata, skb);
|
||||
__skb_queue_tail(&tmpq, skb);
|
||||
}
|
||||
|
||||
|
@ -1941,6 +1941,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
|
||||
compare_ether_addr(sdata->vif.addr, hdr->addr3) == 0)
|
||||
return RX_CONTINUE;
|
||||
|
||||
skb_set_queue_mapping(skb, ieee80211_select_queue(sdata, skb));
|
||||
mesh_hdr->ttl--;
|
||||
|
||||
if (status->rx_flags & IEEE80211_RX_RA_MATCH) {
|
||||
@ -1965,12 +1966,10 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
|
||||
memset(info, 0, sizeof(*info));
|
||||
info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING;
|
||||
info->control.vif = &rx->sdata->vif;
|
||||
info->control.jiffies = jiffies;
|
||||
if (is_multicast_ether_addr(fwd_hdr->addr1)) {
|
||||
IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.mesh,
|
||||
fwded_mcast);
|
||||
skb_set_queue_mapping(fwd_skb,
|
||||
ieee80211_select_queue(sdata, fwd_skb));
|
||||
ieee80211_set_qos_hdr(sdata, fwd_skb);
|
||||
} else {
|
||||
int err;
|
||||
/*
|
||||
|
@ -83,7 +83,7 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
|
||||
break;
|
||||
#ifdef CONFIG_MAC80211_MESH
|
||||
case NL80211_IFTYPE_MESH_POINT:
|
||||
ra = skb->data;
|
||||
qos = true;
|
||||
break;
|
||||
#endif
|
||||
case NL80211_IFTYPE_STATION:
|
||||
|
Loading…
Reference in New Issue
Block a user