diff options
author | Antonio Quartulli <antonio@open-mesh.com> | 2013-06-04 14:11:39 +0400 |
---|---|---|
committer | Antonio Quartulli <antonio@meshcoding.com> | 2013-10-19 17:11:21 +0400 |
commit | c018ad3de61a1dc4194879a53e5559e094aa7b1a (patch) | |
tree | 4edb9c156b618dae46d38249a5c817e0d1f1e2b0 /net/batman-adv/main.h | |
parent | bc58eeef744df93e141678ef44452f0869cd563d (diff) | |
download | linux-c018ad3de61a1dc4194879a53e5559e094aa7b1a.tar.xz |
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/main.h')
-rw-r--r-- | net/batman-adv/main.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index ff55dccbf6e4..2774d7f4ee0b 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -169,14 +169,6 @@ enum batadv_uev_type { #include <linux/seq_file.h> #include "types.h" -/** - * 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), -}; - #define BATADV_PRINT_VID(vid) (vid & BATADV_VLAN_HAS_TAG ? \ (int)(vid & VLAN_VID_MASK) : -1) @@ -368,5 +360,6 @@ int batadv_tvlv_containers_process(struct batadv_priv *bat_priv, void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, uint8_t *src, uint8_t *dst, uint8_t type, uint8_t version, void *tvlv_value, uint16_t tvlv_value_len); +unsigned short batadv_get_vid(struct sk_buff *skb, size_t header_len); #endif /* _NET_BATMAN_ADV_MAIN_H_ */ |