diff options
author | David S. Miller <davem@davemloft.net> | 2016-02-11 03:49:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-02-11 03:49:55 -0500 |
commit | 30c1de08dda9202699c1ddc7fd658693faf93bf2 (patch) | |
tree | 0f4280ab8c520544fbd61866e8b5ce25f78a7294 /include/net/udp_tunnel.h | |
parent | dba6cf556026f38bf68a4a998671b7c44401e118 (diff) | |
parent | 92dcdf09a139e51b7b043b9443b8fd69de298dff (diff) | |
download | linux-30c1de08dda9202699c1ddc7fd658693faf93bf2.tar.bz2 |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Antonio Quartulli says:
====================
Here you have a batch of patches by Sven Eckelmann that
drops our private reference counting implementation and
substitutes it with the kref objects/functions.
Then you have a patch, by Simon Wunderlich, that
makes the broadcast protection window code more generic so
that it can be re-used in the future by other components
with different requirements.
Lastly, Sven is also introducing two lockdep asserts in
functions operating on our TVLV container list, to make
sure that the proper lock is always acquired by the users.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/udp_tunnel.h')
0 files changed, 0 insertions, 0 deletions