Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[pandora-kernel.git] / net / batman-adv / types.h

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 85cf122..25bd1db 100644 (file)
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -224,7 +224,7 @@ struct socket_packet {
 struct tt_local_entry {
        uint8_t addr[ETH_ALEN];
        unsigned long last_seen;
-       char never_purge;
+       uint16_t flags;
        atomic_t refcount;
        struct rcu_head rcu;
        struct hlist_node hash_entry;
@@ -234,7 +234,7 @@ struct tt_global_entry {
        uint8_t addr[ETH_ALEN];
        struct orig_node *orig_node;
        uint8_t ttvn;
-       uint8_t flags; /* only TT_GLOBAL_ROAM is used */
+       uint16_t flags; /* only TT_GLOBAL_ROAM is used */
        unsigned long roam_at; /* time at which TT_GLOBAL_ROAM was set */
        atomic_t refcount;
        struct rcu_head rcu;