Ticket #1032: shpreamble-r1823.2.diff

net80211/ieee80211_ioctl.h

@@ -598 +598 @@
-        IEEE80211_PARAM_MARKDFS         = 58,   /* mark a dfs interference channel when found */
-        IEEE80211_PARAM_REGCLASS        = 59,   /* enable regclass ids in country IE */
-        IEEE80211_PARAM_DROPUNENC_EAPOL = 60,   /* drop unencrypted eapol frames */
+        IEEE80211_PARAM_SHPREAMBLE      = 61,   /* Short Preamble */
-};
-
-#define SIOCG80211STATS                 (SIOCDEVPRIVATE+2)

net80211/ieee80211_node.c

@@ -1845 +1845 @@
-                "%s%s%s%s%s%s%s",
-                newassoc ? "" : "re",
-                IEEE80211_NODE_AID(ni),
-
+
+
-                ic->ic_flags & IEEE80211_F_SHSLOT ? "short" : "long",
-                ic->ic_flags & IEEE80211_F_USEPROT ? ", protection" : "",
-                ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "",

net80211/ieee80211_wireless.c

@@ -2369 +2369 @@
-                        ic->ic_flags &= ~IEEE80211_F_DOTH;
-                retv = ENETRESET;       /* XXX: need something this drastic? */
-                break;
+        case IEEE80211_PARAM_SHPREAMBLE:
+                if (value) {
+                        ic->ic_caps |= IEEE80211_C_SHPREAMBLE;
+                        ic->ic_flags |= IEEE80211_F_SHPREAMBLE;
+                        ic->ic_flags &= ~IEEE80211_F_USEBARKER;
+                } else {
+                        ic->ic_caps &= ~IEEE80211_C_SHPREAMBLE;
+                        ic->ic_flags &= ~IEEE80211_F_SHPREAMBLE;
+                        ic->ic_flags |= IEEE80211_F_USEBARKER;
+                }       
+                retv = ENETRESET;       /* requires restart */
+                break;
-        case IEEE80211_PARAM_PWRTARGET:
-                ic->ic_curchanmaxpwr = value;
-                break;
@@ -2765 +2777 @@
-        case IEEE80211_PARAM_DOTH:
-                param[0] = (ic->ic_flags & IEEE80211_F_DOTH) != 0;
-                break;
+        case IEEE80211_PARAM_SHPREAMBLE:
+                param[0] = (ic->ic_caps & IEEE80211_C_SHPREAMBLE) != 0;
+                break;
-        case IEEE80211_PARAM_PWRTARGET:
-                param[0] = ic->ic_curchanmaxpwr;
-                break;
@@ -5079 +5094 @@
-          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "dropunenceapol" },
-        { IEEE80211_PARAM_DROPUNENC_EAPOL,
-          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_dropunencea" },
+        { IEEE80211_PARAM_SHPREAMBLE,
+          IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "shpreamble" },
+        { IEEE80211_PARAM_SHPREAMBLE,
+          0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_shpreamble" },
-        /*
-         * NB: these should be roamrssi* etc, but iwpriv usurps all
-         *     strings that start with roam!

net80211/ieee80211_input.c

@@ -3469 +3469 @@
-                 * XXX may need different/additional driver callbacks?
-                 */
-                if (IEEE80211_IS_CHAN_A(ic->ic_curchan) ||
-
+
+
-                        ic->ic_flags |= IEEE80211_F_SHPREAMBLE;
-                        ic->ic_flags &= ~IEEE80211_F_USEBARKER;
-                } else {
@@ -3494 +3495 @@
-                IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_ASSOC, wh->i_addr2,
-                        "%sassoc success: %s preamble, %s slot time%s%s%s%s%s%s%s",
-                        ISREASSOC(subtype) ? "re" : "",
-
+
+
-                        ic->ic_flags&IEEE80211_F_SHSLOT ? "short" : "long",
-                        ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "",
-                        ni->ni_flags & IEEE80211_NODE_QOS ? ", QoS" : "",