diff --git a/[refs] b/[refs] index aae2195d08ce..59091412a417 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37c5798968d0ce4d479f114f1d5785551b57bfa5 +refs/heads/master: cc0672a1066829be7e1b0128a13e36a2d0a15479 diff --git a/trunk/include/linux/wireless.h b/trunk/include/linux/wireless.h index 3160dfed73ca..2864b1699ecc 100644 --- a/trunk/include/linux/wireless.h +++ b/trunk/include/linux/wireless.h @@ -455,6 +455,7 @@ #define IW_MODE_REPEAT 4 /* Wireless Repeater (forwarder) */ #define IW_MODE_SECOND 5 /* Secondary master/repeater (backup) */ #define IW_MODE_MONITOR 6 /* Passive monitor (listen only) */ +#define IW_MODE_MESH 7 /* Mesh (IEEE 802.11s) network */ /* Statistics flags (bitmask in updated) */ #define IW_QUAL_QUAL_UPDATED 0x01 /* Value was updated since last read */