diff options
| author | Antonio Quartulli <antonio@open-mesh.com> | 2013-06-04 12:11:39 +0200 |
|---|---|---|
| committer | Antonio Quartulli <antonio@meshcoding.com> | 2013-10-19 15:11:21 +0200 |
| commit | c018ad3de61a1dc4194879a53e5559e094aa7b1a (patch) | |
| tree | 4edb9c156b618dae46d38249a5c817e0d1f1e2b0 /net/batman-adv/packet.h | |
| parent | batman-adv: update email address for Marek Lindner (diff) | |
| download | linux-c018ad3de61a1dc4194879a53e5559e094aa7b1a.tar.xz linux-c018ad3de61a1dc4194879a53e5559e094aa7b1a.zip | |
batman-adv: add the VLAN ID attribute to the TT entry
To make the translation table code VLAN-aware, each entry
must carry the VLAN ID which it belongs to. This patch adds
such attribute to the related TT structures.
Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
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 { BATADV_TT_CLIENT_TEMP = BIT(11), }; +/** + * batadv_vlan_flags - flags for the four MSB of any vlan ID field + * @BATADV_VLAN_HAS_TAG: whether the field contains a valid vlan tag or not + */ +enum batadv_vlan_flags { + BATADV_VLAN_HAS_TAG = BIT(15), +}; + /* claim frame types for the bridge loop avoidance */ enum batadv_bla_claimframe { BATADV_CLAIM_TYPE_CLAIM = 0x00, @@ -399,21 +407,23 @@ struct batadv_tvlv_tt_data { * batadv_tt_client_flags) * @reserved: reserved field * @addr: mac address of non-mesh client that triggered this tt change + * @vid: VLAN identifier */ struct batadv_tvlv_tt_change { uint8_t flags; uint8_t reserved; uint8_t addr[ETH_ALEN]; + __be16 vid; }; /** * struct batadv_tvlv_roam_adv - roaming advertisement * @client: mac address of roaming client - * @reserved: field reserved for future use + * @vid: VLAN identifier */ struct batadv_tvlv_roam_adv { uint8_t client[ETH_ALEN]; - uint16_t reserved; + __be16 vid; }; #endif /* _NET_BATMAN_ADV_PACKET_H_ */ |