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

Commit d4231ca3 authored by Abhijeet Kolekar's avatar Abhijeet Kolekar Committed by John W. Linville
Browse files

mac80211 : Fixes the status message for iwconfig 



iwconfig was showing incorrect status messages when disassociated.
Patch fixes this by always checking for association status in
ioctl calls for getting ap address.

Signed-off-by: default avatarAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 633257d3

net/mac80211/wext.c

+8 −3
Original line number Diff line number Diff line
@@ -489,9 +489,14 @@ static int ieee80211_ioctl_giwap(struct net_device *dev, 
	sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	if (sdata->vif.type == IEEE80211_IF_TYPE_STA ||

	    sdata->vif.type == IEEE80211_IF_TYPE_IBSS) {

		if (sdata->u.sta.state == IEEE80211_ASSOCIATED) {

			ap_addr->sa_family = ARPHRD_ETHER;

			memcpy(&ap_addr->sa_data, sdata->u.sta.bssid, ETH_ALEN);

			return 0;

		} else {

			memset(&ap_addr->sa_data, 0, ETH_ALEN);

			return 0;

		}

	} else if (sdata->vif.type == IEEE80211_IF_TYPE_WDS) {

		ap_addr->sa_family = ARPHRD_ETHER;

		memcpy(&ap_addr->sa_data, sdata->u.wds.remote_addr, ETH_ALEN);