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

Commit ec5a07d5 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: use bssidx from struct brcmf_if for bsscfg specific commands 



The firmware interface has functions to send bsscfg specific commands
to the device. These functions currently have a bssidx parameter, but
that same information is stored in struct brcmf_if, which is in the
private data of the net_device parameter.

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

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

+13 −14
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "dhd.h"

#include "dhd.h"

#include "dhd_bus.h"

#include "dhd_bus.h"

#include "dhd_dbg.h"

#include "dhd_dbg.h"

#include "fwil.h"









static s32

static s32
@@ -263,7 +264,7 @@ brcmf_create_bsscfg(s32 bssidx, char *name, char *data, u32 datalen, char *buf, 
}

}





s32

s32

brcmf_fil_bsscfg_data_set(struct net_device *ndev, s32 bssidx, char *name,

brcmf_fil_bsscfg_data_set(struct net_device *ndev, char *name,

			  void *data, u32 len)

			  void *data, u32 len)

{

{

	struct brcmf_if *ifp = netdev_priv(ndev);

	struct brcmf_if *ifp = netdev_priv(ndev);
@@ -273,11 +274,11 @@ brcmf_fil_bsscfg_data_set(struct net_device *ndev, s32 bssidx, char *name, 




	mutex_lock(&drvr->proto_block);

	mutex_lock(&drvr->proto_block);





	brcmf_dbg(FIL, "bssidx=%d, name=%s, len=%d\n", bssidx, name, len);

	brcmf_dbg(FIL, "bssidx=%d, name=%s, len=%d\n", ifp->bssidx, name, len);

	brcmf_dbg_hex_dump(BRCMF_FIL_ON(), data, len, "data");

	brcmf_dbg_hex_dump(BRCMF_FIL_ON(), data, len, "data");





	buflen = brcmf_create_bsscfg(bssidx, name, data, len, drvr->proto_buf,

	buflen = brcmf_create_bsscfg(ifp->bssidx, name, data, len,

				     sizeof(drvr->proto_buf));

				     drvr->proto_buf, sizeof(drvr->proto_buf));

	if (buflen) {

	if (buflen) {

		err = brcmf_fil_cmd_data(ifp, BRCMF_C_SET_VAR, drvr->proto_buf,

		err = brcmf_fil_cmd_data(ifp, BRCMF_C_SET_VAR, drvr->proto_buf,

					 buflen, true);

					 buflen, true);
@@ -291,7 +292,7 @@ brcmf_fil_bsscfg_data_set(struct net_device *ndev, s32 bssidx, char *name, 
}

}





s32

s32

brcmf_fil_bsscfg_data_get(struct net_device *ndev, s32 bssidx, char *name,

brcmf_fil_bsscfg_data_get(struct net_device *ndev, char *name,

			  void *data, u32 len)

			  void *data, u32 len)

{

{

	struct brcmf_if *ifp = netdev_priv(ndev);

	struct brcmf_if *ifp = netdev_priv(ndev);
@@ -301,8 +302,8 @@ brcmf_fil_bsscfg_data_get(struct net_device *ndev, s32 bssidx, char *name, 




	mutex_lock(&drvr->proto_block);

	mutex_lock(&drvr->proto_block);





	buflen = brcmf_create_bsscfg(bssidx, name, NULL, len, drvr->proto_buf,

	buflen = brcmf_create_bsscfg(ifp->bssidx, name, NULL, len,

				     sizeof(drvr->proto_buf));

				     drvr->proto_buf, sizeof(drvr->proto_buf));

	if (buflen) {

	if (buflen) {

		err = brcmf_fil_cmd_data(ifp, BRCMF_C_GET_VAR, drvr->proto_buf,

		err = brcmf_fil_cmd_data(ifp, BRCMF_C_GET_VAR, drvr->proto_buf,

					 buflen, false);

					 buflen, false);
@@ -312,7 +313,7 @@ brcmf_fil_bsscfg_data_get(struct net_device *ndev, s32 bssidx, char *name, 
		err = -EPERM;

		err = -EPERM;

		brcmf_dbg(ERROR, "Creating bsscfg failed\n");

		brcmf_dbg(ERROR, "Creating bsscfg failed\n");

	}

	}

	brcmf_dbg(FIL, "bssidx=%d, name=%s, len=%d\n", bssidx, name, len);

	brcmf_dbg(FIL, "bssidx=%d, name=%s, len=%d\n", ifp->bssidx, name, len);

	brcmf_dbg_hex_dump(BRCMF_FIL_ON(), data, len, "data");

	brcmf_dbg_hex_dump(BRCMF_FIL_ON(), data, len, "data");





	mutex_unlock(&drvr->proto_block);

	mutex_unlock(&drvr->proto_block);
@@ -321,23 +322,21 @@ brcmf_fil_bsscfg_data_get(struct net_device *ndev, s32 bssidx, char *name, 
}

}





s32

s32

brcmf_fil_bsscfg_int_set(struct net_device *ndev, s32 bssidx, char *name,

brcmf_fil_bsscfg_int_set(struct net_device *ndev, char *name, u32 data)

			 u32 data)

{

{

	__le32 data_le = cpu_to_le32(data);

	__le32 data_le = cpu_to_le32(data);





	return brcmf_fil_bsscfg_data_set(ndev, bssidx, name, &data_le,

	return brcmf_fil_bsscfg_data_set(ndev, name, &data_le,

					 sizeof(data_le));

					 sizeof(data_le));

}

}





s32

s32

brcmf_fil_bsscfg_int_get(struct net_device *ndev, s32 bssidx, char *name,

brcmf_fil_bsscfg_int_get(struct net_device *ndev, char *name, u32 *data)

			 u32 *data)

{

{

	__le32 data_le = cpu_to_le32(*data);

	__le32 data_le = cpu_to_le32(*data);

	s32 err;

	s32 err;





	err = brcmf_fil_bsscfg_data_get(ndev, bssidx, name, &data_le,

	err = brcmf_fil_bsscfg_data_get(ndev, name, &data_le,

					sizeof(data_le));

					sizeof(data_le));

	if (err == 0)

	if (err == 0)

		*data = le32_to_cpu(data_le);

		*data = le32_to_cpu(data_le);

drivers/net/wireless/brcm80211/brcmfmac/fwil.h

+6 −8
Original line number Original line Diff line number Diff line
@@ -31,13 +31,11 @@ s32 brcmf_fil_iovar_data_get(struct net_device *ndev, char *name, void *data, 
s32 brcmf_fil_iovar_int_set(struct net_device *ndev, char *name, u32 data);

s32 brcmf_fil_iovar_int_set(struct net_device *ndev, char *name, u32 data);

s32 brcmf_fil_iovar_int_get(struct net_device *ndev, char *name, u32 *data);

s32 brcmf_fil_iovar_int_get(struct net_device *ndev, char *name, u32 *data);





s32 brcmf_fil_bsscfg_data_set(struct net_device *ndev, s32 bssidx, char *name,

s32 brcmf_fil_bsscfg_data_set(struct net_device *ndev, char *name, void *data,

			      void *data, u32 len);

			      u32 len);

s32 brcmf_fil_bsscfg_data_get(struct net_device *ndev, s32 bssidx, char *name,

s32 brcmf_fil_bsscfg_data_get(struct net_device *ndev, char *name, void *data,

			      void *data, u32 len);

			      u32 len);

s32 brcmf_fil_bsscfg_int_set(struct net_device *ndev, s32 bssidx, char *name,

s32 brcmf_fil_bsscfg_int_set(struct net_device *ndev, char *name, u32 data);

			     u32 data);

s32 brcmf_fil_bsscfg_int_get(struct net_device *ndev, char *name, u32 *data);

s32 brcmf_fil_bsscfg_int_get(struct net_device *ndev, s32 bssidx, char *name,

			     u32 *data);





#endif /* _fwil_h_ */
 
#endif /* _fwil_h_ */

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

+14 −14
Original line number Original line Diff line number Diff line
@@ -417,7 +417,7 @@ send_key_to_dongle(struct brcmf_cfg80211_info *cfg, s32 bssidx, 




	brcmf_netdev_wait_pend8021x(ndev);

	brcmf_netdev_wait_pend8021x(ndev);





	err = brcmf_fil_bsscfg_data_set(ndev, bssidx, "wsec_key", &key_le,

	err = brcmf_fil_bsscfg_data_set(ndev, "wsec_key", &key_le,

					sizeof(key_le));

					sizeof(key_le));





	if (err)

	if (err)
@@ -1596,7 +1596,7 @@ brcmf_set_sharedkey(struct net_device *ndev, 
	if (sec->auth_type == NL80211_AUTHTYPE_SHARED_KEY) {

	if (sec->auth_type == NL80211_AUTHTYPE_SHARED_KEY) {

		WL_CONN("set auth_type to shared key\n");

		WL_CONN("set auth_type to shared key\n");

		val = WL_AUTH_SHARED_KEY;	/* shared key */

		val = WL_AUTH_SHARED_KEY;	/* shared key */

		err = brcmf_fil_bsscfg_int_set(ndev, bssidx, "auth", val);

		err = brcmf_fil_bsscfg_int_set(ndev, "auth", val);

		if (err)

		if (err)

			WL_ERR("set auth failed (%d)\n", err);

			WL_ERR("set auth failed (%d)\n", err);

	}

	}
@@ -1815,7 +1815,7 @@ brcmf_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *ndev, 
		return -EIO;

		return -EIO;





	bssidx = brcmf_find_bssidx(cfg, ndev);

	bssidx = brcmf_find_bssidx(cfg, ndev);

	err = brcmf_fil_bsscfg_int_get(ndev, bssidx, "wsec", &wsec);

	err = brcmf_fil_bsscfg_int_get(ndev, "wsec", &wsec);

	if (err) {

	if (err) {

		WL_ERR("WLC_GET_WSEC error (%d)\n", err);

		WL_ERR("WLC_GET_WSEC error (%d)\n", err);

		goto done;

		goto done;
@@ -1994,13 +1994,13 @@ brcmf_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, 
	if (err)

	if (err)

		goto done;

		goto done;





	err = brcmf_fil_bsscfg_int_get(ndev, bssidx, "wsec", &wsec);

	err = brcmf_fil_bsscfg_int_get(ndev, "wsec", &wsec);

	if (err) {

	if (err) {

		WL_ERR("get wsec error (%d)\n", err);

		WL_ERR("get wsec error (%d)\n", err);

		goto done;

		goto done;

	}

	}

	wsec |= val;

	wsec |= val;

	err = brcmf_fil_bsscfg_int_set(ndev, bssidx, "wsec", wsec);

	err = brcmf_fil_bsscfg_int_set(ndev, "wsec", wsec);

	if (err) {

	if (err) {

		WL_ERR("set wsec error (%d)\n", err);

		WL_ERR("set wsec error (%d)\n", err);

		goto done;

		goto done;
@@ -2070,7 +2070,7 @@ brcmf_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, 
	memset(&params, 0, sizeof(params));

	memset(&params, 0, sizeof(params));





	bssidx = brcmf_find_bssidx(cfg, ndev);

	bssidx = brcmf_find_bssidx(cfg, ndev);

	err = brcmf_fil_bsscfg_int_get(ndev, bssidx, "wsec", &wsec);

	err = brcmf_fil_bsscfg_int_get(ndev, "wsec", &wsec);

	if (err) {

	if (err) {

		WL_ERR("WLC_GET_WSEC error (%d)\n", err);

		WL_ERR("WLC_GET_WSEC error (%d)\n", err);

		/* Ignore this error, may happen during DISASSOC */

		/* Ignore this error, may happen during DISASSOC */
@@ -3481,19 +3481,19 @@ static s32 brcmf_configure_opensecurity(struct net_device *ndev, s32 bssidx) 
	s32 err;

	s32 err;





	/* set auth */

	/* set auth */

	err = brcmf_fil_bsscfg_int_set(ndev, bssidx, "auth", 0);

	err = brcmf_fil_bsscfg_int_set(ndev, "auth", 0);

	if (err < 0) {

	if (err < 0) {

		WL_ERR("auth error %d\n", err);

		WL_ERR("auth error %d\n", err);

		return err;

		return err;

	}

	}

	/* set wsec */

	/* set wsec */

	err = brcmf_fil_bsscfg_int_set(ndev, bssidx, "wsec", 0);

	err = brcmf_fil_bsscfg_int_set(ndev, "wsec", 0);

	if (err < 0) {

	if (err < 0) {

		WL_ERR("wsec error %d\n", err);

		WL_ERR("wsec error %d\n", err);

		return err;

		return err;

	}

	}

	/* set upper-layer auth */

	/* set upper-layer auth */

	err = brcmf_fil_bsscfg_int_set(ndev, bssidx, "wpa_auth", WPA_AUTH_NONE);

	err = brcmf_fil_bsscfg_int_set(ndev, "wpa_auth", WPA_AUTH_NONE);

	if (err < 0) {

	if (err < 0) {

		WL_ERR("wpa_auth error %d\n", err);

		WL_ERR("wpa_auth error %d\n", err);

		return err;

		return err;
@@ -3654,7 +3654,7 @@ brcmf_configure_wpaie(struct net_device *ndev, struct brcmf_vs_tlv *wpa_ie, 
				wme_bss_disable = 0;

				wme_bss_disable = 0;

		}

		}

		/* set wme_bss_disable to sync RSN Capabilities */

		/* set wme_bss_disable to sync RSN Capabilities */

		err = brcmf_fil_bsscfg_int_set(ndev, bssidx, "wme_bss_disable",

		err = brcmf_fil_bsscfg_int_set(ndev, "wme_bss_disable",

					       wme_bss_disable);

					       wme_bss_disable);

		if (err < 0) {

		if (err < 0) {

			WL_ERR("wme_bss_disable error %d\n", err);

			WL_ERR("wme_bss_disable error %d\n", err);
@@ -3665,19 +3665,19 @@ brcmf_configure_wpaie(struct net_device *ndev, struct brcmf_vs_tlv *wpa_ie, 
	wsec = (pval | gval | SES_OW_ENABLED);

	wsec = (pval | gval | SES_OW_ENABLED);





	/* set auth */

	/* set auth */

	err = brcmf_fil_bsscfg_int_set(ndev, bssidx, "auth", auth);

	err = brcmf_fil_bsscfg_int_set(ndev, "auth", auth);

	if (err < 0) {

	if (err < 0) {

		WL_ERR("auth error %d\n", err);

		WL_ERR("auth error %d\n", err);

		goto exit;

		goto exit;

	}

	}

	/* set wsec */

	/* set wsec */

	err = brcmf_fil_bsscfg_int_set(ndev, bssidx, "wsec", wsec);

	err = brcmf_fil_bsscfg_int_set(ndev, "wsec", wsec);

	if (err < 0) {

	if (err < 0) {

		WL_ERR("wsec error %d\n", err);

		WL_ERR("wsec error %d\n", err);

		goto exit;

		goto exit;

	}

	}

	/* set upper-layer auth */

	/* set upper-layer auth */

	err = brcmf_fil_bsscfg_int_set(ndev, bssidx, "wpa_auth", wpa_auth);

	err = brcmf_fil_bsscfg_int_set(ndev, "wpa_auth", wpa_auth);

	if (err < 0) {

	if (err < 0) {

		WL_ERR("wpa_auth error %d\n", err);

		WL_ERR("wpa_auth error %d\n", err);

		goto exit;

		goto exit;
@@ -3907,7 +3907,7 @@ brcmf_set_management_ie(struct brcmf_cfg80211_info *cfg, 
		}

		}

	}

	}

	if (total_ie_buf_len) {

	if (total_ie_buf_len) {

		err  = brcmf_fil_bsscfg_data_set(ndev, bssidx, "vndr_ie",

		err  = brcmf_fil_bsscfg_data_set(ndev, "vndr_ie",

						 iovar_ie_buf,

						 iovar_ie_buf,

						 total_ie_buf_len);

						 total_ie_buf_len);

		if (err)

		if (err)