diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-01-26 14:31:08 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-26 14:31:08 -0500 |
| commit | 49b3eb772505dc42b61c2920ca777d55455a8ee4 (patch) | |
| tree | d0279114338f465c6055e4b2f3398eb5bb0c79c2 /net/batman-adv/soft-interface.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-dev-49b3eb772505dc42b61c2920ca777d55455a8ee4.tar.xz linux-dev-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/soft-interface.c')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 420e19b501f2..5d099b2e6cfc 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * @@ -258,7 +258,8 @@ static int batadv_interface_tx(struct sk_buff *skb, ethhdr = eth_hdr(skb); /* Register the client MAC in the transtable */ - if (!is_multicast_ether_addr(ethhdr->h_source)) { + if (!is_multicast_ether_addr(ethhdr->h_source) && + !batadv_bla_is_loopdetect_mac(ethhdr->h_source)) { client_added = batadv_tt_local_add(soft_iface, ethhdr->h_source, vid, skb->skb_iif, skb->mark); |