Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7de84403 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents c5549ee4 a1a745ef

net/batman-adv/distributed-arp-table.c

+3 −2
Original line number Diff line number Diff line
@@ -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");

net/batman-adv/routing.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

			}

		}