add new ieee80211 interface media types

diff --git a/sys/net/if_media.h b/sys/net/if_media.h
index 6f23989..77b67a6 100644 (file)
--- a/sys/net/if_media.h
+++ b/sys/net/if_media.h
@@ -189,19 +189,28 @@ int       ifmedia_baudrate(int);
 #define        IFM_IEEE80211_OFDM72    18      /* OFDM 72Mbps */
 #define        IFM_IEEE80211_DS354k    19      /* Direct Sequence 354Kbps */
 #define        IFM_IEEE80211_DS512k    20      /* Direct Sequence 512Kbps */
-
-#define        IFM_IEEE80211_ADHOC     0x00000100      /* Operate in Adhoc mode */
-#define        IFM_IEEE80211_HOSTAP    0x00000200      /* Operate in Host AP mode */
-#define        IFM_IEEE80211_IBSS      0x00000400      /* Operate in IBSS mode */
-#define        IFM_IEEE80211_IBSSMASTER 0x00000800     /* Operate as an IBSS master */
-#define        IFM_IEEE80211_TURBO     0x00001000      /* Operate in turbo mode */
-#define        IFM_IEEE80211_MONITOR   0x00002000      /* Operate in monitor mode */
+#define IFM_IEEE80211_OFDM3     21      /* OFDM 3Mbps */
+#define IFM_IEEE80211_OFDM4     22      /* OFDM 4.5Mbps */
+#define IFM_IEEE80211_OFDM27    23      /* OFDM 27Mbps */
+/* NB: not enough bits to express MCS fully */
+#define IFM_IEEE80211_MCS       24      /* HT MCS rate */
+
+#define IFM_IEEE80211_ADHOC     0x00000100      /* Operate in Adhoc mode */
+#define IFM_IEEE80211_HOSTAP    0x00000200      /* Operate in Host AP mode */
+#define IFM_IEEE80211_IBSS      0x00000400      /* Operate in IBSS mode */
+#define IFM_IEEE80211_WDS       0x00000800      /* Operate in WDS mode */
+#define IFM_IEEE80211_TURBO     0x00001000      /* Operate in turbo mode */
+#define IFM_IEEE80211_MONITOR   0x00002000      /* Operate in monitor mode */
+#define IFM_IEEE80211_MBSS      0x00004000      /* Operate in MBSS mode */
 
 /* operating mode for multi-mode devices */
-#define        IFM_IEEE80211_11A       0x00010000      /* 5Ghz, OFDM mode */
-#define        IFM_IEEE80211_11B       0x00020000      /* Direct Sequence mode */
-#define        IFM_IEEE80211_11G       0x00030000      /* 2Ghz, OFDM mode */
-#define        IFM_IEEE80211_FH        0x00040000      /* 2Ghz, GFSK mode */
+#define IFM_IEEE80211_11A       0x00010000      /* 5Ghz, OFDM mode */
+#define IFM_IEEE80211_11B       0x00020000      /* Direct Sequence mode */
+#define IFM_IEEE80211_11G       0x00030000      /* 2Ghz, CCK mode */
+#define IFM_IEEE80211_FH        0x00040000      /* 2Ghz, GFSK mode */
+#define IFM_IEEE80211_11NA      0x00050000      /* 5Ghz, HT mode */
+#define IFM_IEEE80211_11NG      0x00060000      /* 2Ghz, HT mode */
+
 
 /*
  * ATM
@@ -369,6 +378,11 @@ struct ifmedia_description {
        { IFM_IEEE80211_OFDM48, "OFDM/48Mbps" },                        \
        { IFM_IEEE80211_OFDM54, "OFDM/54Mbps" },                        \
        { IFM_IEEE80211_OFDM72, "OFDM/72Mbps" },                        \
+       { IFM_IEEE80211_DS354k, "DS/354Kbps" },                         \
+       { IFM_IEEE80211_DS512k, "DS/512Kbps" },                         \
+       { IFM_IEEE80211_OFDM3, "OFDM/3Mbps" },                          \
+       { IFM_IEEE80211_OFDM4, "OFDM/4.5Mbps" },                        \
+       { IFM_IEEE80211_OFDM27, "OFDM/27Mbps" },                        \
        { 0, NULL },                                                    \
 }
 
@@ -396,6 +410,17 @@ struct ifmedia_description {
        { IFM_IEEE80211_OFDM48, "OFDM48" },                             \
        { IFM_IEEE80211_OFDM54, "OFDM54" },                             \
        { IFM_IEEE80211_OFDM72, "OFDM72" },                             \
+       { IFM_IEEE80211_DS1, "CCK1" },                                  \
+       { IFM_IEEE80211_DS2, "CCK2" },                                  \
+       { IFM_IEEE80211_DS5, "CCK5.5" },                                \
+       { IFM_IEEE80211_DS11, "CCK11" },                                \
+       { IFM_IEEE80211_DS354k, "DS354K" },                             \
+       { IFM_IEEE80211_DS354k, "DirectSequence/354Kbps" },             \
+       { IFM_IEEE80211_DS512k, "DS512K" },                             \
+       { IFM_IEEE80211_DS512k, "DirectSequence/512Kbps" },             \
+       { IFM_IEEE80211_OFDM3, "OFDM3" },                               \
+       { IFM_IEEE80211_OFDM4, "OFDM4.5" },                             \
+       { IFM_IEEE80211_OFDM27, "OFDM27" },                             \
        { 0, NULL },                                                    \
 }
 
@@ -403,9 +428,10 @@ struct ifmedia_description {
        { IFM_IEEE80211_ADHOC, "adhoc" },                               \
        { IFM_IEEE80211_HOSTAP, "hostap" },                             \
        { IFM_IEEE80211_IBSS, "ibss" },                                 \
-       { IFM_IEEE80211_IBSSMASTER, "ibss-master" },                    \
+       { IFM_IEEE80211_WDS, "wds" },                                   \
        { IFM_IEEE80211_TURBO, "turbo" },                               \
        { IFM_IEEE80211_MONITOR, "monitor" },                           \
+       { IFM_IEEE80211_MBSS, "mesh" },                                 \
        { 0, NULL },                                                    \
 }
 
@@ -415,6 +441,8 @@ struct ifmedia_description {
        { IFM_IEEE80211_11B, "11b" },                                   \
        { IFM_IEEE80211_11G, "11g" },                                   \
        { IFM_IEEE80211_FH, "fh" },                                     \
+       { IFM_IEEE80211_11NA, "11na" },                                 \
+       { IFM_IEEE80211_11NG, "11ng" },                                 \
        { 0, NULL },                                                    \
 }