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

Commit 10bcf745 authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

wl12xx: remove set_bss_type field 



set_bss_type is no longer evaluated, so delete it.

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 536129c8

drivers/net/wireless/wl12xx/main.c

+0 −8
Original line number Diff line number Diff line
@@ -1894,11 +1894,9 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw, 
		/* fall-through */

	case NL80211_IFTYPE_STATION:

		wlvif->bss_type = BSS_TYPE_STA_BSS;

		wl->set_bss_type = BSS_TYPE_STA_BSS;

		break;

	case NL80211_IFTYPE_ADHOC:

		wlvif->bss_type = BSS_TYPE_IBSS;

		wl->set_bss_type = BSS_TYPE_STA_BSS;

		break;

	case NL80211_IFTYPE_P2P_GO:

		wl->p2p = 1;
@@ -2107,7 +2105,6 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl, 


	memset(wl->ssid, 0, IEEE80211_MAX_SSID_LEN + 1);

	wl->ssid_len = 0;

	wl->set_bss_type = MAX_BSS_TYPE;

	wl->p2p = 0;

	wl->band = IEEE80211_BAND_2GHZ;
@@ -3439,10 +3436,6 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl, 
		wl1271_debug(DEBUG_ADHOC, "ad-hoc beaconing: %s",

			     bss_conf->enable_beacon ? "enabled" : "disabled");



		if (bss_conf->enable_beacon)

			wl->set_bss_type = BSS_TYPE_IBSS;

		else

			wl->set_bss_type = BSS_TYPE_STA_BSS;

		do_join = true;

	}
@@ -4858,7 +4851,6 @@ struct ieee80211_hw *wl1271_alloc_hw(void) 
	wl->flags = 0;

	wl->sg_enabled = true;

	wl->hw_pg_ver = -1;

	wl->set_bss_type = MAX_BSS_TYPE;

	wl->last_tx_hlid = 0;

	wl->ap_ps_map = 0;

	wl->ap_fw_ps_map = 0;

drivers/net/wireless/wl12xx/wl12xx.h

+0 −1
Original line number Diff line number Diff line
@@ -400,7 +400,6 @@ struct wl1271 { 
	s8 hw_pg_ver;



	u8 mac_addr[ETH_ALEN];

	u8 set_bss_type;

	u8 p2p; /* we are using p2p role */

	u8 ssid[IEEE80211_MAX_SSID_LEN + 1];

	u8 ssid_len;