D16566.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D16566.id.diff
View Options

	Index: head/sbin/ifconfig/ifieee80211.c
	===================================================================
	--- head/sbin/ifconfig/ifieee80211.c
	+++ head/sbin/ifconfig/ifieee80211.c
	@@ -3496,7 +3496,7 @@
	uint8_t buf[24*1024];
	char ssid[IEEE80211_NWID_LEN+1];
	const uint8_t *cp;
	- int len, ssidmax, idlen;
	+ int len, idlen;

	if (get80211len(s, IEEE80211_IOC_SCAN_RESULTS, buf, sizeof(buf), &len) < 0)
	errx(1, "unable to get scan results");
	@@ -3505,9 +3505,8 @@

	getchaninfo(s);

	- ssidmax = verbose ? IEEE80211_NWID_LEN : 32;
	printf("%-.s %-17.17s %4s %4s %-7s %3s %4s\n"
	- , ssidmax, ssidmax, "SSID/MESH ID"
	+ , IEEE80211_NWID_LEN, IEEE80211_NWID_LEN, "SSID/MESH ID"
	, "BSSID"
	, "CHAN"
	, "RATE"
	@@ -3530,8 +3529,8 @@
	idlen = sr->isr_ssid_len;
	}
	printf("%-.s %s %3d %3dM %4d:%-4d %4d %-4.4s"
	- , ssidmax
	- , copy_essid(ssid, ssidmax, idp, idlen)
	+ , IEE80211_NWID_LEN
	+ , copy_essid(ssid, IEE80211_NWID_LEN, idp, idlen)
	, ssid
	, ether_ntoa((const struct ether_addr *) sr->isr_bssid)
	, ieee80211_mhz2ieee(sr->isr_freq, sr->isr_flags)