Merge tag 'mac80211-for-davem-2016-06-29-v2' of git://git.kernel.org/pub/scm/linux...
authorDavid S. Miller <davem@davemloft.net>
Wed, 29 Jun 2016 12:33:46 +0000 (08:33 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 Jun 2016 12:33:46 +0000 (08:33 -0400)
commit751ad819b0bf443ad8963eb7bfbd533e6a463973
treece381c06652ee1d42a79462aa84f29b48697ec67
parentd913d3a763a6f66a862a6eafcf6da89a7905832a
parentc041778c966c92c964033f1cdfee60a9f2b5e465
Merge tag 'mac80211-for-davem-2016-06-29-v2' of git://git./linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
Just two small fixes
 * fix mesh peer link counter, decrement wasn't always done at all
 * fix ethertype (length) for packets without RFC 1042 or bridge
   tunnel header
====================

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