Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca25ebe5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2016-08-05' of... 

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



Johannes Berg says:

====================
First set of fixes for the current cycle:
 * fix 80+80 bandwidth warning
 * fix powersave with mac80211 TXQ implementation
 * use correct way to free SKBs from multicast buffering
 * mesh: fix operation ordering to work with all drivers
 * mesh: end service period even when peer goes away
 * mesh: correct HT opmode validity checks
 * pass hw pointer from mac80211 to driver in TPT method,
   fixing a bug (in a bit the wrong way, but that's what
   we have right now)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ba0cc3c1 2439ca04

drivers/net/wireless/ti/wlcore/main.c

+3 −2
Original line number Diff line number Diff line
@@ -5700,10 +5700,11 @@ static void wlcore_op_sta_statistics(struct ieee80211_hw *hw, 
	mutex_unlock(&wl->mutex);

}



static u32 wlcore_op_get_expected_throughput(struct ieee80211_sta *sta)

static u32 wlcore_op_get_expected_throughput(struct ieee80211_hw *hw,

					     struct ieee80211_sta *sta)

{

	struct wl1271_station *wl_sta = (struct wl1271_station *)sta->drv_priv;

	struct wl1271 *wl = wl_sta->wl;

	struct wl1271 *wl = hw->priv;

	u8 hlid = wl_sta->hlid;



	/* return in units of Kbps */

include/net/mac80211.h

+2 −1
Original line number Diff line number Diff line
@@ -3620,7 +3620,8 @@ struct ieee80211_ops { 


	int (*join_ibss)(struct ieee80211_hw *hw, struct ieee80211_vif *vif);

	void (*leave_ibss)(struct ieee80211_hw *hw, struct ieee80211_vif *vif);

	u32 (*get_expected_throughput)(struct ieee80211_sta *sta);

	u32 (*get_expected_throughput)(struct ieee80211_hw *hw,

				       struct ieee80211_sta *sta);

	int (*get_txpower)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

			   int *dbm);

net/mac80211/cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -869,7 +869,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev) 


	/* free all potentially still buffered bcast frames */

	local->total_ps_buffered -= skb_queue_len(&sdata->u.ap.ps.bc_buf);

	skb_queue_purge(&sdata->u.ap.ps.bc_buf);

	ieee80211_purge_tx_queue(&local->hw, &sdata->u.ap.ps.bc_buf);



	mutex_lock(&local->mtx);

	ieee80211_vif_copy_chanctx_to_vlans(sdata, true);

net/mac80211/driver-ops.h

+1 −1
Original line number Diff line number Diff line
@@ -1094,7 +1094,7 @@ static inline u32 drv_get_expected_throughput(struct ieee80211_local *local, 


	trace_drv_get_expected_throughput(sta);

	if (local->ops->get_expected_throughput)

		ret = local->ops->get_expected_throughput(sta);

		ret = local->ops->get_expected_throughput(&local->hw, sta);

	trace_drv_return_u32(local, ret);



	return ret;

net/mac80211/mesh.c

+6 −4
Original line number Diff line number Diff line
@@ -881,20 +881,22 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata) 


	netif_carrier_off(sdata->dev);



	/* flush STAs and mpaths on this iface */

	sta_info_flush(sdata);

	mesh_path_flush_by_iface(sdata);



	/* stop the beacon */

	ifmsh->mesh_id_len = 0;

	sdata->vif.bss_conf.enable_beacon = false;

	clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);

	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);



	/* remove beacon */

	bcn = rcu_dereference_protected(ifmsh->beacon,

					lockdep_is_held(&sdata->wdev.mtx));

	RCU_INIT_POINTER(ifmsh->beacon, NULL);

	kfree_rcu(bcn, rcu_head);



	/* flush STAs and mpaths on this iface */

	sta_info_flush(sdata);

	mesh_path_flush_by_iface(sdata);



	/* free all potentially still buffered group-addressed frames */

	local->total_ps_buffered -= skb_queue_len(&ifmsh->ps.bc_buf);

	skb_queue_purge(&ifmsh->ps.bc_buf);