From: David S. Miller <davem@davemloft.net>
Date: Wed, 29 Jun 2016 12:33:46 +0000 (-0400)
Subject: Merge tag 'mac80211-for-davem-2016-06-29-v2' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v4.7-rc6~25^2
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/751ad819b0bf443ad8963eb7bfbd533e6a463973

Merge tag 'mac80211-for-davem-2016-06-29-v2' of git://git.kernel.org/pub/scm/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>
---

751ad819b0bf443ad8963eb7bfbd533e6a463973