PERFORCE change 80279 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=80279

Change 80279 by sam at sam_ebb on 2005/07/15 16:31:10

	add ff+dturbo stuff back after ifc

Affected files ...

.. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#40 edit

Differences ...

==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#40 (text+ko) ====

@@ -411,6 +411,18 @@
 }
 
 static void
+set80211fastframes(const char *val, int d, int s, const struct afswtch *rafp)
+{
+	set80211(s, IEEE80211_IOC_FF, d, 0, NULL);
+}
+
+static void
+set80211dturbo(const char *val, int d, int s, const struct afswtch *rafp)
+{
+	set80211(s, IEEE80211_IOC_TURBOP, d, 0, NULL);
+}
+
+static void
 set80211chanlist(const char *val, int d, int s, const struct afswtch *rafp)
 {
 	struct ieee80211req_chanlist chanlist;
@@ -1547,6 +1559,21 @@
 	} else
 		wme = 0;
 
+	ireq.i_type = IEEE80211_IOC_FF;
+	if (ioctl(s, SIOCG80211, &ireq) != -1) {
+		if (ireq.i_val)
+			LINE_CHECK("%cff", spacer);
+		else if (verbose)
+			LINE_CHECK("%c-ff", spacer);
+	}
+	ireq.i_type = IEEE80211_IOC_TURBOP;
+	if (ioctl(s, SIOCG80211, &ireq) != -1) {
+		if (ireq.i_val)
+			LINE_CHECK("%cdturbo", spacer);
+		else if (verbose)
+			LINE_CHECK("%c-dturbo", spacer);
+	}
+
 	if (opmode == IEEE80211_M_HOSTAP) {
 		ireq.i_type = IEEE80211_IOC_HIDESSID;
 		if (ioctl(s, SIOCG80211, &ireq) != -1) {
@@ -1805,6 +1832,10 @@
 #endif
 	DEF_CMD("pureg",	1,	set80211pureg),
 	DEF_CMD("-pureg",	0,	set80211pureg),
+	DEF_CMD("ff",		1,	set80211fastframes),
+	DEF_CMD("-ff",		0,	set80211fastframes),
+	DEF_CMD("dturbo",	1,	set80211dturbo),
+	DEF_CMD("-dturbo",	0,	set80211dturbo),
 };
 static struct afswtch af_ieee80211 = {
 	.af_name	= "af_ieee80211",