Merge tag 'mac80211-for-davem-2016-12-16' of... (67a72a58) · Commits · 戴 / test

net/mac80211/key.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -265,6 +265,7 @@ static void __ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata,
		if (uni) {
		rcu_assign_pointer(sdata->default_unicast_key, key);
		ieee80211_check_fast_xmit_iface(sdata);
		if (sdata->vif.type != NL80211_IFTYPE_AP_VLAN)
		drv_set_default_unicast_key(sdata->local, sdata, idx);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -2472,7 +2472,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
		if (!ifmsh->mshcfg.dot11MeshForwarding)
		goto out;

		fwd_skb = skb_copy(skb, GFP_ATOMIC);
		fwd_skb = skb_copy_expand(skb, local->tx_headroom, 0, GFP_ATOMIC);
		if (!fwd_skb) {
		net_info_ratelimited("%s: failed to clone mesh frame\n",
		sdata->name);

+8 −6

Original line number	Diff line number	Diff line
		@@ -1972,6 +1972,7 @@ static void sta_stats_decode_rate(struct ieee80211_local *local, u16 rate,
		u16 brate;
		unsigned int shift;

		rinfo->flags = 0;
		sband = local->hw.wiphy->bands[(rate >> 4) & 0xf];
		brate = sband->bitrates[rate & 0xf].bitrate;
		if (rinfo->bw == RATE_INFO_BW_5)
		@@ -1987,14 +1988,15 @@ static void sta_stats_decode_rate(struct ieee80211_local *local, u16 rate,
		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);

		if (rate == STA_STATS_RATE_INVALID)
		rinfo->flags = 0;
		else
		return -EINVAL;

		sta_stats_decode_rate(sta->local, rate, rinfo);
		return 0;
		}

		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)
		}

		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);
		}