diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-29 14:33:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-29 14:33:46 +0200 |
| commit | 751ad819b0bf443ad8963eb7bfbd533e6a463973 (patch) | |
| tree | ce381c06652ee1d42a79462aa84f29b48697ec67 /net/ipv4/gre_demux.c | |
| parent | openvswitch: fix conntrack netlink event delivery (diff) | |
| parent | cfg80211: fix proto in ieee80211_data_to_8023 for frames without LLC header (diff) | |
| download | linux-751ad819b0bf443ad8963eb7bfbd533e6a463973.tar.xz linux-751ad819b0bf443ad8963eb7bfbd533e6a463973.zip | |
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 'net/ipv4/gre_demux.c')
0 files changed, 0 insertions, 0 deletions