Merge tag 'batadv-net-for-davem-20160708' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 11 Jul 2016 19:28:44 +0000 (12:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 11 Jul 2016 19:28:44 +0000 (12:28 -0700)
commit7d32eb8781a0eccf8ab7bf33877014c7637ad271
tree06bd487fc8592630dbf7fcb7da76411f09d21b89
parent95556a883834122c616bbeb942654d745ceb9712
parentd1fe176ca51fa3cb35f70c1d876d9a090e9befce
Merge tag 'batadv-net-for-davem-20160708' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

====================
Here are a couple batman-adv bugfix patches, all by Sven Eckelmann:

 - Fix possible NULL pointer dereference for vlan_insert_tag (two patches)

 - Fix reference handling in some features, which may lead to reference
   leaks or invalid memory access (four patches)

 - Fix speedy join: DHCP packets handled by the gateway feature should
   be sent with 4-address unicast instead of 3-address unicast to make
   speedy join work. This fixes/speeds up DHCP assignment for clients
   which join a mesh for the first time. (one patch)
====================

Signed-off-by: David S. Miller <davem@davemloft.net>