summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-06-29 08:33:46 -0400
committerDavid S. Miller <davem@davemloft.net>2016-06-29 08:33:46 -0400
commit751ad819b0bf443ad8963eb7bfbd533e6a463973 (patch)
treece381c06652ee1d42a79462aa84f29b48697ec67 /drivers/net
parentd913d3a763a6f66a862a6eafcf6da89a7905832a (diff)
parentc041778c966c92c964033f1cdfee60a9f2b5e465 (diff)
downloadlinux-751ad819b0bf443ad8963eb7bfbd533e6a463973.tar.gz
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>
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions