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

Commit d2cf344d authored by Hante Meuleman's avatar Hante Meuleman Committed by John W. Linville
Browse files

brcmfmac: Fix vendor cmds used interface. 



The vendor specific commands was always using main interface,
change this to use the by caller supplied interface.

Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e9efa340

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

+9 −6
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ static int brcmf_cfg80211_vndr_cmds_dcmd_handler(struct wiphy *wiphy, 
						 struct wireless_dev *wdev,

						 const void *data, int len)

{

	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);

	struct net_device *ndev = cfg_to_ndev(cfg);

	struct brcmf_cfg80211_vif *vif;

	struct brcmf_if *ifp;

	const struct brcmf_vndr_dcmd_hdr *cmdhdr = data;

	struct sk_buff *reply;

	int ret, payload, ret_len;
@@ -42,6 +42,9 @@ static int brcmf_cfg80211_vndr_cmds_dcmd_handler(struct wiphy *wiphy, 
	brcmf_dbg(TRACE, "cmd %x set %d len %d\n", cmdhdr->cmd, cmdhdr->set,

		  cmdhdr->len);



	vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);

	ifp = vif->ifp;



	len -= sizeof(struct brcmf_vndr_dcmd_hdr);

	ret_len = cmdhdr->len;

	if (ret_len > 0 || len > 0) {
@@ -63,11 +66,11 @@ static int brcmf_cfg80211_vndr_cmds_dcmd_handler(struct wiphy *wiphy, 
	}



	if (cmdhdr->set)

		ret = brcmf_fil_cmd_data_set(netdev_priv(ndev), cmdhdr->cmd,

					     dcmd_buf, ret_len);

		ret = brcmf_fil_cmd_data_set(ifp, cmdhdr->cmd, dcmd_buf,

					     ret_len);

	else

		ret = brcmf_fil_cmd_data_get(netdev_priv(ndev), cmdhdr->cmd,

					     dcmd_buf, ret_len);

		ret = brcmf_fil_cmd_data_get(ifp, cmdhdr->cmd, dcmd_buf,

					     ret_len);

	if (ret != 0)

		goto exit;