diff options
author | David S. Miller <davem@davemloft.net> | 2017-01-26 20:31:08 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-01-26 20:31:08 +0100 |
commit | 49b3eb772505dc42b61c2920ca777d55455a8ee4 (patch) | |
tree | d0279114338f465c6055e4b2f3398eb5bb0c79c2 /net/batman-adv/bridge_loop_avoidance.c | |
parent | ISDN: eicon: reduce stack size of sig_ind function (diff) | |
parent | batman-adv: Treat NET_XMIT_CN as transmit successfully (diff) | |
download | linux-49b3eb772505dc42b61c2920ca777d55455a8ee4.tar.xz linux-49b3eb772505dc42b61c2920ca777d55455a8ee4.zip |
Merge tag 'batadv-next-for-davem-20170126' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature/cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- ignore self-generated loop detect MAC addresses in translation table,
by Simon Wunderlich
- install uapi batman_adv.h header, by Sven Eckelmann
- bump copyright years, by Sven Eckelmann
- Remove an unused variable in translation table code, by Sven Eckelmann
- Handle NET_XMIT_CN like NET_XMIT_SUCCESS (revised according to Davids
suggestion), and a follow up code clean up, by Gao Feng (2 patches)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/bridge_loop_avoidance.c')
-rw-r--r-- | net/batman-adv/bridge_loop_avoidance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 36917a7b1b59..ba8420d8a992 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2017 B.A.T.M.A.N. contributors: * * Simon Wunderlich * |