Browse Source

P2P: Add defined values for P2P Manageability Bitmap

Jouni Malinen 14 years ago
parent
commit
6c6915f3db
2 changed files with 8 additions and 2 deletions
  1. 3 2
      src/ap/beacon.c
  2. 5 0
      src/common/ieee802_11_defs.h

+ 3 - 2
src/ap/beacon.c

@@ -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;

+ 5 - 0
src/common/ieee802_11_defs.h

@@ -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,