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

Commit c1f3bb6b authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
parents dcd60771 3c57e865

Documentation/DocBook/80211.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -152,8 +152,8 @@ 
!Finclude/net/cfg80211.h cfg80211_scan_request

!Finclude/net/cfg80211.h cfg80211_scan_done

!Finclude/net/cfg80211.h cfg80211_bss

!Finclude/net/cfg80211.h cfg80211_inform_bss_frame

!Finclude/net/cfg80211.h cfg80211_inform_bss

!Finclude/net/cfg80211.h cfg80211_inform_bss_width_frame

!Finclude/net/cfg80211.h cfg80211_inform_bss_width

!Finclude/net/cfg80211.h cfg80211_unlink_bss

!Finclude/net/cfg80211.h cfg80211_find_ie

!Finclude/net/cfg80211.h ieee80211_bss_get_ie

drivers/bluetooth/btusb.c

+0 −1
Original line number Diff line number Diff line
@@ -1629,7 +1629,6 @@ static struct usb_driver btusb_driver = { 
#ifdef CONFIG_PM

	.suspend	= btusb_suspend,

	.resume		= btusb_resume,

	.reset_resume	= btusb_resume,

#endif

	.id_table	= btusb_table,

	.supports_autosuspend = 1,

drivers/net/wireless/ath/ath9k/init.c

+2 −1
Original line number Diff line number Diff line
@@ -845,7 +845,8 @@ static const struct ieee80211_iface_limit if_limits[] = { 
};



static const struct ieee80211_iface_limit if_dfs_limits[] = {

	{ .max = 1,	.types = BIT(NL80211_IFTYPE_AP) },

	{ .max = 1,	.types = BIT(NL80211_IFTYPE_AP) |

				 BIT(NL80211_IFTYPE_ADHOC) },

};



static const struct ieee80211_iface_combination if_comb[] = {

drivers/net/wireless/iwlwifi/dvm/ucode.c

+4 −5
Original line number Diff line number Diff line
@@ -330,15 +330,14 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv, 
	enum iwl_ucode_type old_type;

	static const u8 alive_cmd[] = { REPLY_ALIVE };



	old_type = priv->cur_ucode;

	priv->cur_ucode = ucode_type;

	fw = iwl_get_ucode_image(priv, ucode_type);

	if (WARN_ON(!fw))

		return -EINVAL;



	old_type = priv->cur_ucode;

	priv->cur_ucode = ucode_type;

	priv->ucode_loaded = false;



	if (!fw)

		return -EINVAL;



	iwl_init_notification_wait(&priv->notif_wait, &alive_wait,

				   alive_cmd, ARRAY_SIZE(alive_cmd),

				   iwl_alive_fn, &alive_data);

drivers/net/wireless/iwlwifi/iwl-fw.h

+2 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ enum iwl_ucode_tlv_flag { 
	IWL_UCODE_TLV_FLAGS_P2P			= BIT(3),

	IWL_UCODE_TLV_FLAGS_DW_BC_TABLE		= BIT(4),

	IWL_UCODE_TLV_FLAGS_NEWBT_COEX		= BIT(5),

	IWL_UCODE_TLV_FLAGS_UAPSD		= BIT(6),

	IWL_UCODE_TLV_FLAGS_PM_CMD_SUPPORT	= BIT(6),

	IWL_UCODE_TLV_FLAGS_SHORT_BL		= BIT(7),

	IWL_UCODE_TLV_FLAGS_RX_ENERGY_API	= BIT(8),

	IWL_UCODE_TLV_FLAGS_TIME_EVENT_API_V2	= BIT(9),
@@ -113,6 +113,7 @@ enum iwl_ucode_tlv_flag { 
	IWL_UCODE_TLV_FLAGS_SCHED_SCAN		= BIT(17),

	IWL_UCODE_TLV_FLAGS_STA_KEY_CMD		= BIT(19),

	IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD	= BIT(20),

	IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT	= BIT(24),

};



/* The default calibrate table size if not specified by firmware file */