diff options
author | David S. Miller <davem@davemloft.net> | 2016-05-10 23:36:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-05-10 23:36:14 -0400 |
commit | cf88585b1d5ce49515aabb381812976e2840a967 (patch) | |
tree | e878f445261d1d28c53660c580d3d6d47aac565e /net/ipv4/tcp_bic.c | |
parent | 953abb3823633385b1235add9c30c3e775dee0bc (diff) | |
parent | 676970e55b1033af7f0a03d4037b4d9b76327ded (diff) | |
download | linux-cf88585b1d5ce49515aabb381812976e2840a967.tar.gz linux-cf88585b1d5ce49515aabb381812976e2840a967.tar.bz2 linux-cf88585b1d5ce49515aabb381812976e2840a967.zip |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Antonio Quartulli says:
====================
Included changes:
- remove useless skb size check in batadv_interface_rx
- basic netns support introduced by Andrew Lunn:
- prevent virtual interface from changing netns by setting
NETIF_F_NETNS_LOCAL
- create virtual interface within the netns of the first
hard-interface
- introduce detection of complex bridge loops and report event
to the user (via udev) when the Bridge Loop Avoidance mechanism
can't prevent them
- minor reference counting bugfixes for the hard_iface object that
couldn't make it via the net tree
- use kref_get() instead of kref_get_unless_zero() to make reference
counting bug more visible
- use batadv_compare_eth() all over the code when possible instead of
plain memcmp()
- minor code cleanup and style adjustments
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_bic.c')
0 files changed, 0 insertions, 0 deletions