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

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

Merge tag 'mac80211-for-davem-2015-11-03' of... 

Merge tag 'mac80211-for-davem-2015-11-03' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Another set of fixes:
 * remove a warning on a check that can trigger without any
   errors having happened (Andrei)
 * correctly handle deauth request while in the process of
   associating (Andrei)
 * fix TDLS HT operation (Arik)
 * allow changing AID/listen interval during client setup (Ayala)
 * be more forgiving with WMM parameters to get HT/VHT in case of
   broken APs with bad WMM settings (Emmanuel, myself)
 * a number of other fixes (some in documentation)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3d131f07 e4208427

include/net/cfg80211.h

+4 −0
Original line number Diff line number Diff line
@@ -2399,6 +2399,10 @@ struct cfg80211_qos_map { 
 * @set_power_mgmt: Configure WLAN power management. A timeout value of -1

 *	allows the driver to adjust the dynamic ps timeout value.

 * @set_cqm_rssi_config: Configure connection quality monitor RSSI threshold.

 *	After configuration, the driver should (soon) send an event indicating

 *	the current level is above/below the configured threshold; this may

 *	need some care when the configuration is changed (without first being

 *	disabled.)

 * @set_cqm_txe_config: Configure connection quality monitor TX error

 *	thresholds.

 * @sched_scan_start: Tell the driver to start a scheduled scan.

include/net/mac80211.h

+9 −1
Original line number Diff line number Diff line
@@ -482,7 +482,9 @@ struct ieee80211_event { 
 *	Note that with TDLS this can be the case (channel is HT, protection must

 *	be used from this field) even when the BSS association isn't using HT.

 * @cqm_rssi_thold: Connection quality monitor RSSI threshold, a zero value

 *	implies disabled

 *	implies disabled. As with the cfg80211 callback, a change here should

 *	cause an event to be sent indicating where the current value is in

 *	relation to the newly configured threshold.

 * @cqm_rssi_hyst: Connection quality monitor RSSI hysteresis

 * @arp_addr_list: List of IPv4 addresses for hardware ARP filtering. The

 *	may filter ARP queries targeted for other addresses than listed here.
@@ -3170,18 +3172,24 @@ enum ieee80211_reconfig_type { 
 *	The callback is optional and can sleep.

 *

 * @add_chanctx: Notifies device driver about new channel context creation.

 *	This callback may sleep.

 * @remove_chanctx: Notifies device driver about channel context destruction.

 *	This callback may sleep.

 * @change_chanctx: Notifies device driver about channel context changes that

 *	may happen when combining different virtual interfaces on the same

 *	channel context with different settings

 *	This callback may sleep.

 * @assign_vif_chanctx: Notifies device driver about channel context being bound

 *	to vif. Possible use is for hw queue remapping.

 *	This callback may sleep.

 * @unassign_vif_chanctx: Notifies device driver about channel context being

 *	unbound from vif.

 *	This callback may sleep.

 * @switch_vif_chanctx: switch a number of vifs from one chanctx to

 *	another, as specified in the list of

 *	@ieee80211_vif_chanctx_switch passed to the driver, according

 *	to the mode defined in &ieee80211_chanctx_switch_mode.

 *	This callback may sleep.

 *

 * @start_ap: Start operation on the AP interface, this is called after all the

 *	information in bss_conf is set and beacon can be retrieved. A channel

net/mac80211/cfg.c

+3 −3
Original line number Diff line number Diff line
@@ -2010,12 +2010,12 @@ ieee80211_sched_scan_start(struct wiphy *wiphy, 
static int

ieee80211_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	struct ieee80211_local *local = wiphy_priv(wiphy);



	if (!sdata->local->ops->sched_scan_stop)

	if (!local->ops->sched_scan_stop)

		return -EOPNOTSUPP;



	return ieee80211_request_sched_scan_stop(sdata);

	return ieee80211_request_sched_scan_stop(local);

}



static int ieee80211_auth(struct wiphy *wiphy, struct net_device *dev,

net/mac80211/driver-ops.c

+46 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2015 Intel Deutschland GmbH

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.
@@ -8,6 +10,48 @@ 
#include "trace.h"

#include "driver-ops.h"



int drv_start(struct ieee80211_local *local)

{

	int ret;



	might_sleep();



	if (WARN_ON(local->started))

		return -EALREADY;



	trace_drv_start(local);

	local->started = true;

	/* allow rx frames */

	smp_mb();

	ret = local->ops->start(&local->hw);

	trace_drv_return_int(local, ret);



	if (ret)

		local->started = false;



	return ret;

}



void drv_stop(struct ieee80211_local *local)

{

	might_sleep();



	if (WARN_ON(!local->started))

		return;



	trace_drv_stop(local);

	local->ops->stop(&local->hw);

	trace_drv_return_void(local);



	/* sync away all work on the tasklet before clearing started */

	tasklet_disable(&local->tasklet);

	tasklet_enable(&local->tasklet);



	barrier();



	local->started = false;

}



int drv_add_interface(struct ieee80211_local *local,

		      struct ieee80211_sub_if_data *sdata)

{
@@ -192,6 +236,8 @@ int drv_switch_vif_chanctx(struct ieee80211_local *local, 
	int ret = 0;

	int i;



	might_sleep();



	if (!local->ops->switch_vif_chanctx)

		return -EOPNOTSUPP;

net/mac80211/driver-ops.h

+12 −30
Original line number Diff line number Diff line
@@ -66,36 +66,8 @@ static inline int drv_get_et_sset_count(struct ieee80211_sub_if_data *sdata, 
	return rv;

}



static inline int drv_start(struct ieee80211_local *local)

{

	int ret;



	might_sleep();



	trace_drv_start(local);

	local->started = true;

	smp_mb();

	ret = local->ops->start(&local->hw);

	trace_drv_return_int(local, ret);

	return ret;

}



static inline void drv_stop(struct ieee80211_local *local)

{

	might_sleep();



	trace_drv_stop(local);

	local->ops->stop(&local->hw);

	trace_drv_return_void(local);



	/* sync away all work on the tasklet before clearing started */

	tasklet_disable(&local->tasklet);

	tasklet_enable(&local->tasklet);



	barrier();



	local->started = false;

}

int drv_start(struct ieee80211_local *local);

void drv_stop(struct ieee80211_local *local);



#ifdef CONFIG_PM

static inline int drv_suspend(struct ieee80211_local *local,
@@ -871,6 +843,8 @@ static inline int drv_add_chanctx(struct ieee80211_local *local, 
{

	int ret = -EOPNOTSUPP;



	might_sleep();



	trace_drv_add_chanctx(local, ctx);

	if (local->ops->add_chanctx)

		ret = local->ops->add_chanctx(&local->hw, &ctx->conf);
@@ -884,6 +858,8 @@ static inline int drv_add_chanctx(struct ieee80211_local *local, 
static inline void drv_remove_chanctx(struct ieee80211_local *local,

				      struct ieee80211_chanctx *ctx)

{

	might_sleep();



	if (WARN_ON(!ctx->driver_present))

		return;
@@ -898,6 +874,8 @@ static inline void drv_change_chanctx(struct ieee80211_local *local, 
				      struct ieee80211_chanctx *ctx,

				      u32 changed)

{

	might_sleep();



	trace_drv_change_chanctx(local, ctx, changed);

	if (local->ops->change_chanctx) {

		WARN_ON_ONCE(!ctx->driver_present);
@@ -931,6 +909,8 @@ static inline void drv_unassign_vif_chanctx(struct ieee80211_local *local, 
					    struct ieee80211_sub_if_data *sdata,

					    struct ieee80211_chanctx *ctx)

{

	might_sleep();



	if (!check_sdata_in_driver(sdata))

		return;
@@ -953,6 +933,8 @@ static inline int drv_start_ap(struct ieee80211_local *local, 
{

	int ret = 0;



	might_sleep();



	if (!check_sdata_in_driver(sdata))

		return -EIO;