diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-13 13:46:01 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-13 13:46:01 -0400 |
| commit | 7de84403a2020874714f6f40170f5ef9fc7ab58e (patch) | |
| tree | 7bddbbcba054e55fbda405f8b6482aa2d0a6203a /net/batman-adv | |
| parent | c5549ee40112f2511a794c9aad7eb6ac5f18b0eb (diff) | |
| parent | a1a745ef980a1b48299ead4ea7990e62c0516f6e (diff) | |
| download | linux-7de84403a2020874714f6f40170f5ef9fc7ab58e.tar.gz | |
Merge tag 'batadv-net-for-davem-20170613' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says: ==================== Here are two batman-adv bugfixes: - fix rx packet counters for local ARP replies, by Sven Eckelmann - fix memory leaks for unicast packetes received from another gateway in bridge loop avoidance, by Andreas Pape ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv')
| -rw-r--r-- | net/batman-adv/distributed-arp-table.c | 5 | ||||
| -rw-r--r-- | net/batman-adv/routing.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 013e970eff39..000ca2f113ab 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -1064,8 +1064,9 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, skb_new->protocol = eth_type_trans(skb_new, soft_iface); - soft_iface->stats.rx_packets++; - soft_iface->stats.rx_bytes += skb->len + ETH_HLEN + hdr_size; + batadv_inc_counter(bat_priv, BATADV_CNT_RX); + batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES, + skb->len + ETH_HLEN + hdr_size); netif_rx(skb_new); batadv_dbg(BATADV_DBG_DAT, bat_priv, "ARP request replied locally\n"); diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index e1ebe14ee2a6..ae9f4d37d34f 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -987,7 +987,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, batadv_dbg(BATADV_DBG_BLA, bat_priv, "recv_unicast_packet(): Dropped unicast pkt received from another backbone gw %pM.\n", orig_addr_gw); - return NET_RX_DROP; + goto free_skb; } } |