diff options
| author | John W. Linville | 2012-07-17 21:31:33 +0200 |
|---|---|---|
| committer | John W. Linville | 2012-07-17 21:31:33 +0200 |
| commit | d369f7b2b257ad6369b72d39e2f989833754a9ce (patch) | |
| tree | 0092a805f7a152ed161ee8995bb1672a7b74cced /net/mac80211/tx.c | |
| parent | bcma: add place for flash memory support (diff) | |
| parent | NFC: NCI module license 'unspecified' taints kernel (diff) | |
| download | kernel-qcow2-linux-d369f7b2b257ad6369b72d39e2f989833754a9ce.tar.gz kernel-qcow2-linux-d369f7b2b257ad6369b72d39e2f989833754a9ce.tar.xz kernel-qcow2-linux-d369f7b2b257ad6369b72d39e2f989833754a9ce.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index b755e778b0c4..acf712ffb5e6 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1824,6 +1824,9 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, /* RA TA mDA mSA AE:DA SA */ mesh_da = mppath->mpp; is_mesh_mcast = 0; + } else if (mpath) { + mesh_da = mpath->dst; + is_mesh_mcast = 0; } else { /* DA TA mSA AE:SA */ mesh_da = bcast; @@ -2721,7 +2724,7 @@ EXPORT_SYMBOL(ieee80211_get_buffered_bc); void ieee80211_tx_skb_tid(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, int tid) { - int ac = ieee802_1d_to_ac[tid]; + int ac = ieee802_1d_to_ac[tid & 7]; skb_set_mac_header(skb, 0); skb_set_network_header(skb, 0); |