diff options
Diffstat (limited to 'net/batman-adv/packet.h')
-rw-r--r-- | net/batman-adv/packet.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h index 65e723ed030b..6311642f3ee8 100644 --- a/net/batman-adv/packet.h +++ b/net/batman-adv/packet.h | |||
@@ -122,6 +122,14 @@ enum batadv_tt_client_flags { | |||
122 | BATADV_TT_CLIENT_TEMP = BIT(11), | 122 | BATADV_TT_CLIENT_TEMP = BIT(11), |
123 | }; | 123 | }; |
124 | 124 | ||
125 | /** | ||
126 | * batadv_vlan_flags - flags for the four MSB of any vlan ID field | ||
127 | * @BATADV_VLAN_HAS_TAG: whether the field contains a valid vlan tag or not | ||
128 | */ | ||
129 | enum batadv_vlan_flags { | ||
130 | BATADV_VLAN_HAS_TAG = BIT(15), | ||
131 | }; | ||
132 | |||
125 | /* claim frame types for the bridge loop avoidance */ | 133 | /* claim frame types for the bridge loop avoidance */ |
126 | enum batadv_bla_claimframe { | 134 | enum batadv_bla_claimframe { |
127 | BATADV_CLAIM_TYPE_CLAIM = 0x00, | 135 | BATADV_CLAIM_TYPE_CLAIM = 0x00, |
@@ -399,21 +407,23 @@ struct batadv_tvlv_tt_data { | |||
399 | * batadv_tt_client_flags) | 407 | * batadv_tt_client_flags) |
400 | * @reserved: reserved field | 408 | * @reserved: reserved field |
401 | * @addr: mac address of non-mesh client that triggered this tt change | 409 | * @addr: mac address of non-mesh client that triggered this tt change |
410 | * @vid: VLAN identifier | ||
402 | */ | 411 | */ |
403 | struct batadv_tvlv_tt_change { | 412 | struct batadv_tvlv_tt_change { |
404 | uint8_t flags; | 413 | uint8_t flags; |
405 | uint8_t reserved; | 414 | uint8_t reserved; |
406 | uint8_t addr[ETH_ALEN]; | 415 | uint8_t addr[ETH_ALEN]; |
416 | __be16 vid; | ||
407 | }; | 417 | }; |
408 | 418 | ||
409 | /** | 419 | /** |
410 | * struct batadv_tvlv_roam_adv - roaming advertisement | 420 | * struct batadv_tvlv_roam_adv - roaming advertisement |
411 | * @client: mac address of roaming client | 421 | * @client: mac address of roaming client |
412 | * @reserved: field reserved for future use | 422 | * @vid: VLAN identifier |
413 | */ | 423 | */ |
414 | struct batadv_tvlv_roam_adv { | 424 | struct batadv_tvlv_roam_adv { |
415 | uint8_t client[ETH_ALEN]; | 425 | uint8_t client[ETH_ALEN]; |
416 | uint16_t reserved; | 426 | __be16 vid; |
417 | }; | 427 | }; |
418 | 428 | ||
419 | #endif /* _NET_BATMAN_ADV_PACKET_H_ */ | 429 | #endif /* _NET_BATMAN_ADV_PACKET_H_ */ |