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

Merge tag 'mac80211-for-davem-2019-07-20' of... 

Merge tag 'mac80211-for-davem-2019-07-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
We have a handful of fixes:
 * ignore bad CW parameters if we aren't using them,
   instead of warning
 * fix operation (and then build) with the new netlink vendor
   command policy requirement
 * fix a memory leak in an error path when setting beacons
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1a03bb53 d2b3fe42

drivers/net/wireless/ath/wil6210/cfg80211.c

+4 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ static const struct wiphy_vendor_command wil_nl80211_vendor_commands[] = { 
		.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_DMG_RF_GET_SECTOR_CFG,

		.flags = WIPHY_VENDOR_CMD_NEED_WDEV |

			 WIPHY_VENDOR_CMD_NEED_RUNNING,

		.policy = wil_rf_sector_policy,

		.doit = wil_rf_sector_get_cfg

	},

	{
@@ -184,6 +185,7 @@ static const struct wiphy_vendor_command wil_nl80211_vendor_commands[] = { 
		.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_DMG_RF_SET_SECTOR_CFG,

		.flags = WIPHY_VENDOR_CMD_NEED_WDEV |

			 WIPHY_VENDOR_CMD_NEED_RUNNING,

		.policy = wil_rf_sector_policy,

		.doit = wil_rf_sector_set_cfg

	},

	{
@@ -192,6 +194,7 @@ static const struct wiphy_vendor_command wil_nl80211_vendor_commands[] = { 
			QCA_NL80211_VENDOR_SUBCMD_DMG_RF_GET_SELECTED_SECTOR,

		.flags = WIPHY_VENDOR_CMD_NEED_WDEV |

			 WIPHY_VENDOR_CMD_NEED_RUNNING,

		.policy = wil_rf_sector_policy,

		.doit = wil_rf_sector_get_selected

	},

	{
@@ -200,6 +203,7 @@ static const struct wiphy_vendor_command wil_nl80211_vendor_commands[] = { 
			QCA_NL80211_VENDOR_SUBCMD_DMG_RF_SET_SELECTED_SECTOR,

		.flags = WIPHY_VENDOR_CMD_NEED_WDEV |

			 WIPHY_VENDOR_CMD_NEED_RUNNING,

		.policy = wil_rf_sector_policy,

		.doit = wil_rf_sector_set_selected

	},

};

drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ const struct wiphy_vendor_command brcmf_vendor_cmds[] = { 
		},

		.flags = WIPHY_VENDOR_CMD_NEED_WDEV |

			 WIPHY_VENDOR_CMD_NEED_NETDEV,

		.policy = VENDOR_CMD_RAW_DATA,

		.doit = brcmf_cfg80211_vndr_cmds_dcmd_handler

	},

};

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

+3 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ static const struct wiphy_vendor_command wlcore_vendor_commands[] = { 
		.flags = WIPHY_VENDOR_CMD_NEED_NETDEV |

			 WIPHY_VENDOR_CMD_NEED_RUNNING,

		.doit = wlcore_vendor_cmd_smart_config_start,

		.policy = wlcore_vendor_attr_policy,

	},

	{

		.info = {
@@ -172,6 +173,7 @@ static const struct wiphy_vendor_command wlcore_vendor_commands[] = { 
		.flags = WIPHY_VENDOR_CMD_NEED_NETDEV |

			 WIPHY_VENDOR_CMD_NEED_RUNNING,

		.doit = wlcore_vendor_cmd_smart_config_stop,

		.policy = wlcore_vendor_attr_policy,

	},

	{

		.info = {
@@ -181,6 +183,7 @@ static const struct wiphy_vendor_command wlcore_vendor_commands[] = { 
		.flags = WIPHY_VENDOR_CMD_NEED_NETDEV |

			 WIPHY_VENDOR_CMD_NEED_RUNNING,

		.doit = wlcore_vendor_cmd_smart_config_set_group_key,

		.policy = wlcore_vendor_attr_policy,

	},

};

include/net/cfg80211.h

+1 −1
Original line number Diff line number Diff line
@@ -4170,7 +4170,7 @@ struct sta_opmode_info { 
	u8 rx_nss;

};



#define VENDOR_CMD_RAW_DATA ((const struct nla_policy *)ERR_PTR(-ENODATA))

#define VENDOR_CMD_RAW_DATA ((const struct nla_policy *)(long)(-ENODATA))



/**

 * struct wiphy_vendor_command - vendor command definition

include/uapi/linux/nl80211.h

+1 −1
Original line number Diff line number Diff line
@@ -2863,7 +2863,7 @@ enum nl80211_attrs { 
#define NL80211_HT_CAPABILITY_LEN		26

#define NL80211_VHT_CAPABILITY_LEN		12

#define NL80211_HE_MIN_CAPABILITY_LEN           16

#define NL80211_HE_MAX_CAPABILITY_LEN           51

#define NL80211_HE_MAX_CAPABILITY_LEN           54

#define NL80211_MAX_NR_CIPHER_SUITES		5

#define NL80211_MAX_NR_AKM_SUITES		2