diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-06 02:45:12 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-06 02:45:12 (GMT) |
| commit | f8bae99ee5030625a4e7f0d87784191882292f0e (patch) | |
| tree | 991cd2aff1ec1b74d1e3c658eb2ea09b0f93e5bd /net/batman-adv/types.h | |
| parent | 994635a137f637466d36a7c6272dae014a46a11c (diff) | |
| parent | 44c4349a2a117b22a5c4087f2ac9faf10c575e17 (diff) | |
| download | linux-fsl-qoriq-f8bae99ee5030625a4e7f0d87784191882292f0e.tar.xz | |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
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 85cf122..25bd1db 100644 --- 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; |