projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'batadv-next-for-davem-20170126' of git://git.open-mesh.org/linux-merge
[linux-2.6-block.git]
/
net
/
batman-adv
/
distributed-arp-table.c
diff --git
a/net/batman-adv/distributed-arp-table.c
b/net/batman-adv/distributed-arp-table.c
index dab466f97ccfd5b7101f3c97a7e07aa9a8df6247..1bfd1dbc2feba7bf6c16004ea8ca85ed6066c929 100644
(file)
--- a/
net/batman-adv/distributed-arp-table.c
+++ b/
net/batman-adv/distributed-arp-table.c
@@
-1050,7
+1050,6
@@
bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,
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");