P2P: Add defined values for P2P Manageability Bitmap
authorJouni Malinen <jouni.malinen@atheros.com>
Sat, 10 Jul 2010 15:59:19 +0000 (08:59 -0700)
committerJouni Malinen <j@w1.fi>
Thu, 9 Sep 2010 14:17:20 +0000 (07:17 -0700)
src/ap/beacon.c
src/common/ieee802_11_defs.h

index 9bf9ed9..83c7a27 100644 (file)
@@ -208,9 +208,10 @@ u8 * hostapd_eid_p2p_manage(struct hostapd_data *hapd, u8 *eid)
        *eid++ = P2P_ATTR_MANAGEABILITY;
        WPA_PUT_LE16(eid, 1);
        eid += 2;
-       bitmap = BIT(0); /* P2P Device Management */
+       bitmap = P2P_MAN_DEVICE_MANAGEMENT;
        if (hapd->conf->p2p & P2P_ALLOW_CROSS_CONNECTION)
-               bitmap |= BIT(1); /* Cross Connection Permitted */
+               bitmap |= P2P_MAN_CROSS_CONNECTION_PERMITTED;
+       bitmap |= P2P_MAN_COEXISTENCE_OPTIONAL;
        *eid++ = bitmap;
 
        return eid;
index 3adfbd9..04d80b0 100644 (file)
@@ -686,6 +686,11 @@ enum p2p_attr_id {
 /* Invitation Flags */
 #define P2P_INVITATION_FLAGS_TYPE BIT(0)
 
+/* P2P Manageability */
+#define P2P_MAN_DEVICE_MANAGEMENT BIT(0)
+#define P2P_MAN_CROSS_CONNECTIION_PERMITTED BIT(1)
+#define P2P_MAN_COEXISTENCE_OPTIONAL BIT(2)
+
 enum p2p_status_code {
        P2P_SC_SUCCESS = 0,
        P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE = 1,