diff options
| author | Antonio Quartulli <antonio@open-mesh.com> | 2013-04-19 18:07:00 +0200 |
|---|---|---|
| committer | Antonio Quartulli <ordex@autistici.org> | 2013-05-29 02:44:55 +0200 |
| commit | eb2deb6b39b1597577c1635e9ebf319f1ae02213 (patch) | |
| tree | 94cea78183fa4e5da3245d8ac07ce8020f08ccc8 /net/batman-adv/types.h | |
| parent | aa27c31265f111ff73d948a5846a3f193376491e (diff) | |
| download | op-kernel-dev-eb2deb6b39b1597577c1635e9ebf319f1ae02213.zip op-kernel-dev-eb2deb6b39b1597577c1635e9ebf319f1ae02213.tar.gz | |
batman-adv: change VID semantic in the BLA code
In order to make batman-adv fully vlan aware later, the
semantic used for variables storing the VLAN ID values has
to be changed in order to be adapted to the new one which
will be used batman-adv wide.
In particular, the VID has to be an "_unsigned_ short int"
and its 4 MSB will be used as a flag bitfield, while the
remaining 12 bits are used to store the real VID value
Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Acked-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Diffstat (limited to 'net/batman-adv/types.h')
| -rw-r--r-- | net/batman-adv/types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 5f542bd..b2c94e1 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -642,7 +642,7 @@ struct batadv_socket_packet { #ifdef CONFIG_BATMAN_ADV_BLA struct batadv_bla_backbone_gw { uint8_t orig[ETH_ALEN]; - short vid; + unsigned short vid; struct hlist_node hash_entry; struct batadv_priv *bat_priv; unsigned long lasttime; @@ -665,7 +665,7 @@ struct batadv_bla_backbone_gw { */ struct batadv_bla_claim { uint8_t addr[ETH_ALEN]; - short vid; + unsigned short vid; struct batadv_bla_backbone_gw *backbone_gw; unsigned long lasttime; struct hlist_node hash_entry; |
