diff options
author | David S. Miller <davem@davemloft.net> | 2011-10-30 03:05:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-10-30 03:05:07 -0400 |
commit | 9eeebb5bc8d984298cba9d12690923cdc09ab173 (patch) | |
tree | 2917993c44af42e335533b1018b35c17b3747132 /net/batman-adv/types.h | |
parent | 3ddb709af32bacaf78d124420404d1ac19be99b8 (diff) | |
parent | 93840ac40bb0d0f177ef8af74e64671be67e8c37 (diff) | |
download | op-kernel-dev-9eeebb5bc8d984298cba9d12690923cdc09ab173.zip op-kernel-dev-9eeebb5bc8d984298cba9d12690923cdc09ab173.tar.gz |
Merge branch 'batman-adv/maint' 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 1ae3557..ab8d0fe 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -224,22 +224,22 @@ struct socket_packet { struct tt_local_entry { uint8_t addr[ETH_ALEN]; + struct hlist_node hash_entry; unsigned long last_seen; uint16_t flags; atomic_t refcount; struct rcu_head rcu; - struct hlist_node hash_entry; }; struct tt_global_entry { uint8_t addr[ETH_ALEN]; + struct hlist_node hash_entry; /* entry in the global table */ struct orig_node *orig_node; uint8_t ttvn; 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; - struct hlist_node hash_entry; /* entry in the global table */ }; struct tt_change_node { |