Commit 67a72a58 authored by David S. Miller's avatar David S. Miller

Merge tag 'mac80211-for-davem-2016-12-16' of...

Merge tag 'mac80211-for-davem-2016-12-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
Three fixes:
 * avoid a WARN_ON() when trying to use WEP with AP_VLANs
 * ensure enough headroom on mesh forwarding packets
 * don't report unknown/invalid rates to userspace
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7729bad4 a17d93ff
...@@ -265,6 +265,7 @@ static void __ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata, ...@@ -265,6 +265,7 @@ static void __ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata,
if (uni) { if (uni) {
rcu_assign_pointer(sdata->default_unicast_key, key); rcu_assign_pointer(sdata->default_unicast_key, key);
ieee80211_check_fast_xmit_iface(sdata); ieee80211_check_fast_xmit_iface(sdata);
if (sdata->vif.type != NL80211_IFTYPE_AP_VLAN)
drv_set_default_unicast_key(sdata->local, sdata, idx); drv_set_default_unicast_key(sdata->local, sdata, idx);
} }
......
...@@ -2472,7 +2472,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) ...@@ -2472,7 +2472,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
if (!ifmsh->mshcfg.dot11MeshForwarding) if (!ifmsh->mshcfg.dot11MeshForwarding)
goto out; goto out;
fwd_skb = skb_copy(skb, GFP_ATOMIC); fwd_skb = skb_copy_expand(skb, local->tx_headroom, 0, GFP_ATOMIC);
if (!fwd_skb) { if (!fwd_skb) {
net_info_ratelimited("%s: failed to clone mesh frame\n", net_info_ratelimited("%s: failed to clone mesh frame\n",
sdata->name); sdata->name);
......
...@@ -1972,6 +1972,7 @@ static void sta_stats_decode_rate(struct ieee80211_local *local, u16 rate, ...@@ -1972,6 +1972,7 @@ static void sta_stats_decode_rate(struct ieee80211_local *local, u16 rate,
u16 brate; u16 brate;
unsigned int shift; unsigned int shift;
rinfo->flags = 0;
sband = local->hw.wiphy->bands[(rate >> 4) & 0xf]; sband = local->hw.wiphy->bands[(rate >> 4) & 0xf];
brate = sband->bitrates[rate & 0xf].bitrate; brate = sband->bitrates[rate & 0xf].bitrate;
if (rinfo->bw == RATE_INFO_BW_5) if (rinfo->bw == RATE_INFO_BW_5)
...@@ -1987,14 +1988,15 @@ static void sta_stats_decode_rate(struct ieee80211_local *local, u16 rate, ...@@ -1987,14 +1988,15 @@ static void sta_stats_decode_rate(struct ieee80211_local *local, u16 rate,
rinfo->flags |= RATE_INFO_FLAGS_SHORT_GI; rinfo->flags |= RATE_INFO_FLAGS_SHORT_GI;
} }
static void sta_set_rate_info_rx(struct sta_info *sta, struct rate_info *rinfo) static int sta_set_rate_info_rx(struct sta_info *sta, struct rate_info *rinfo)
{ {
u16 rate = ACCESS_ONCE(sta_get_last_rx_stats(sta)->last_rate); u16 rate = ACCESS_ONCE(sta_get_last_rx_stats(sta)->last_rate);
if (rate == STA_STATS_RATE_INVALID) if (rate == STA_STATS_RATE_INVALID)
rinfo->flags = 0; return -EINVAL;
else
sta_stats_decode_rate(sta->local, rate, rinfo); sta_stats_decode_rate(sta->local, rate, rinfo);
return 0;
} }
static void sta_set_tidstats(struct sta_info *sta, static void sta_set_tidstats(struct sta_info *sta,
...@@ -2199,7 +2201,7 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) ...@@ -2199,7 +2201,7 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
} }
if (!(sinfo->filled & BIT(NL80211_STA_INFO_RX_BITRATE))) { if (!(sinfo->filled & BIT(NL80211_STA_INFO_RX_BITRATE))) {
sta_set_rate_info_rx(sta, &sinfo->rxrate); if (sta_set_rate_info_rx(sta, &sinfo->rxrate) == 0)
sinfo->filled |= BIT(NL80211_STA_INFO_RX_BITRATE); sinfo->filled |= BIT(NL80211_STA_INFO_RX_BITRATE);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment