The following commit has been merged in the master branch: commit 49b3eb772505dc42b61c2920ca777d55455a8ee4 Merge: 27d807180ae0a9e50d90adf9b22573c21be904c2 c33705188c493b7de3b8dc2956d67de91b444727 Author: David S. Miller davem@davemloft.net Date: Thu Jan 26 14:31:08 2017 -0500

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

diff --combined include/uapi/linux/Kbuild index 80ad741,7fdceb2..486e050 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@@ -64,6 -64,7 +64,7 @@@ header-y += auto_fs. header-y += auxvec.h header-y += ax25.h header-y += b1lli.h + header-y += batman_adv.h header-y += baycom.h header-y += bcm933xx_hcs.h header-y += bfs_fs.h @@@ -305,7 -306,6 +306,7 @@@ header-y += netrom. header-y += net_namespace.h header-y += net_tstamp.h header-y += nfc.h +header-y += psample.h header-y += nfs2.h header-y += nfs3.h header-y += nfs4.h @@@ -380,10 -380,6 +381,10 @@@ header-y += sctp. header-y += sdla.h header-y += seccomp.h header-y += securebits.h +header-y += seg6_genl.h +header-y += seg6.h +header-y += seg6_hmac.h +header-y += seg6_iptunnel.h header-y += selinux_netlink.h header-y += sem.h header-y += serial_core.h @@@ -419,7 -415,6 +420,7 @@@ header-y += telephony. header-y += termios.h header-y += thermal.h header-y += time.h +header-y += timerfd.h header-y += times.h header-y += timex.h header-y += tiocl.h diff --combined net/batman-adv/bridge_loop_avoidance.c index 36917a7,2d22fd5..ba8420d --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@@ -1,4 -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 * @@@ -449,6 -449,7 +449,6 @@@ static void batadv_bla_send_claim(struc batadv_inc_counter(bat_priv, BATADV_CNT_RX); batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES, skb->len + ETH_HLEN); - soft_iface->last_rx = jiffies;

netif_rx(skb); out: diff --combined net/batman-adv/distributed-arp-table.c index 6394206,dab466f..1bfd1db --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@@ -1,4 -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: * * Antonio Quartulli * @@@ -1050,6 -1050,7 +1050,6 @@@ bool batadv_dat_snoop_outgoing_arp_requ bat_priv->soft_iface); bat_priv->stats.rx_packets++; bat_priv->stats.rx_bytes += skb->len + ETH_HLEN + hdr_size; - bat_priv->soft_iface->last_rx = jiffies;

netif_rx(skb_new); batadv_dbg(BATADV_DBG_DAT, bat_priv, "ARP request replied locally\n"); diff --combined net/batman-adv/soft-interface.c index 420e19b,4a9923a..5d099b2 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -1,4 -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 +258,8 @@@ static int batadv_interface_tx(struct s 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); @@@ -481,6 -482,8 +482,6 @@@ void batadv_interface_rx(struct net_dev batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES, skb->len + ETH_HLEN);

- soft_iface->last_rx = jiffies; - /* Let the bridge loop avoidance check the packet. If will * not handle it, we can safely push it up. */