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

Commit 944b9e37 authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge remote-tracking branch 'mac80211/master' into mac80211-next 



Pull in mac80211.git to let the next patch apply
without conflicts, also resolving a hwsim conflict.

Conflicts:
	drivers/net/wireless/mac80211_hwsim.c

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents a4ed5346 7ce8c7a3

drivers/bcma/driver_mips.c

+3 −3
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static void bcma_core_mips_set_irq(struct bcma_device *dev, unsigned int irq) 
			/* backplane irq line is in use, find out who uses

			 * it and set user to irq 0

			 */

			list_for_each_entry_reverse(core, &bus->cores, list) {

			list_for_each_entry(core, &bus->cores, list) {

				if ((1 << bcma_core_mips_irqflag(core)) ==

				    oldirqflag) {

					bcma_core_mips_set_irq(core, 0);
@@ -161,7 +161,7 @@ static void bcma_core_mips_dump_irq(struct bcma_bus *bus) 
{

	struct bcma_device *core;



	list_for_each_entry_reverse(core, &bus->cores, list) {

	list_for_each_entry(core, &bus->cores, list) {

		bcma_core_mips_print_irq(core, bcma_core_mips_irq(core));

	}

}
@@ -224,7 +224,7 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore) 
		mcore->assigned_irqs = 1;



	/* Assign IRQs to all cores on the bus */

	list_for_each_entry_reverse(core, &bus->cores, list) {

	list_for_each_entry(core, &bus->cores, list) {

		int mips_irq;

		if (core->irq)

			continue;

drivers/bcma/scan.c

+10 −5
Original line number Diff line number Diff line
@@ -462,8 +462,10 @@ int bcma_bus_scan(struct bcma_bus *bus) 
	while (eromptr < eromend) {

		struct bcma_device *other_core;

		struct bcma_device *core = kzalloc(sizeof(*core), GFP_KERNEL);

		if (!core)

			return -ENOMEM;

		if (!core) {

			err = -ENOMEM;

			goto out;

		}

		INIT_LIST_HEAD(&core->list);

		core->bus = bus;
@@ -478,7 +480,7 @@ int bcma_bus_scan(struct bcma_bus *bus) 
			} else if (err == -ESPIPE) {

				break;

			}

			return err;

			goto out;

		}



		core->core_index = core_num++;
@@ -494,10 +496,12 @@ int bcma_bus_scan(struct bcma_bus *bus) 
		list_add_tail(&core->list, &bus->cores);

	}



	err = 0;

out:

	if (bus->hosttype == BCMA_HOSTTYPE_SOC)

		iounmap(eromptr);



	return 0;

	return err;

}



int __init bcma_bus_scan_early(struct bcma_bus *bus,
@@ -537,7 +541,7 @@ int __init bcma_bus_scan_early(struct bcma_bus *bus, 
		else if (err == -ESPIPE)

			break;

		else if (err < 0)

			return err;

			goto out;



		core->core_index = core_num++;

		bus->nr_cores++;
@@ -551,6 +555,7 @@ int __init bcma_bus_scan_early(struct bcma_bus *bus, 
		break;

	}



out:

	if (bus->hosttype == BCMA_HOSTTYPE_SOC)

		iounmap(eromptr);

drivers/net/wireless/mac80211_hwsim.c

+0 −5
Original line number Diff line number Diff line
@@ -741,11 +741,6 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw, 


	txi = IEEE80211_SKB_CB(skb);



	if (txi->control.vif)

		hwsim_check_magic(txi->control.vif);

	if (control->sta)

		hwsim_check_sta_magic(control->sta);



	ieee80211_tx_info_clear_status(txi);



	/* frame was transmitted at most favorable rate at first attempt */

include/net/cfg80211.h

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ enum ieee80211_band { 
 * 	is not permitted.

 * @IEEE80211_CHAN_NO_HT40MINUS: extension channel below this channel

 * 	is not permitted.

 * @IEEE80211_CHAN_NO_OFDM: OFDM is not allowed on this channel.

 */

enum ieee80211_channel_flags {

	IEEE80211_CHAN_DISABLED		= 1<<0,
@@ -104,6 +105,7 @@ enum ieee80211_channel_flags { 
	IEEE80211_CHAN_RADAR		= 1<<3,

	IEEE80211_CHAN_NO_HT40PLUS	= 1<<4,

	IEEE80211_CHAN_NO_HT40MINUS	= 1<<5,

	IEEE80211_CHAN_NO_OFDM		= 1<<6,

};



#define IEEE80211_CHAN_NO_HT40 \

net/mac80211/cfg.c

+4 −5
Original line number Diff line number Diff line
@@ -1389,6 +1389,8 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, 
	else

		memset(next_hop, 0, ETH_ALEN);



	memset(pinfo, 0, sizeof(*pinfo));



	pinfo->generation = mesh_paths_generation;



	pinfo->filled = MPATH_INFO_FRAME_QLEN |
@@ -1407,7 +1409,6 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, 
	pinfo->discovery_timeout =

			jiffies_to_msecs(mpath->discovery_timeout);

	pinfo->discovery_retries = mpath->discovery_retries;

	pinfo->flags = 0;

	if (mpath->flags & MESH_PATH_ACTIVE)

		pinfo->flags |= NL80211_MPATH_FLAG_ACTIVE;

	if (mpath->flags & MESH_PATH_RESOLVING)
@@ -1416,10 +1417,8 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, 
		pinfo->flags |= NL80211_MPATH_FLAG_SN_VALID;

	if (mpath->flags & MESH_PATH_FIXED)

		pinfo->flags |= NL80211_MPATH_FLAG_FIXED;

	if (mpath->flags & MESH_PATH_RESOLVING)

		pinfo->flags |= NL80211_MPATH_FLAG_RESOLVING;



	pinfo->flags = mpath->flags;

	if (mpath->flags & MESH_PATH_RESOLVED)

		pinfo->flags |= NL80211_MPATH_FLAG_RESOLVED;

}



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