1) Stale SKB data pointer access across pskb_may_pull() calls in L2TP,
from Haishuang Yan.
2) Fix multicast frame handling in mac80211 AP code, from Felix
Fietkau.
3) mac80211 station hashtable insert errors not handled properly, fix
from Johannes Berg.
4) Fix TX descriptor count limit handling in e1000, from Alexander Duyck.
5) Revert a buggy netdev refcount fix in netpoll, from Bjorn Helgaas.
6) Must assign rtnl_link_ops of the device before registering it,
fix in ip6_tunnel from Thadeu Lima de Souza Cascardo.
7) Memory leak fix in tc action net exit, from WANG Cong.
8) Add missing AF_KCM entries to name tables, from Dexuan Cui.
9) Fix regression in GRE handling of csums wrt. FOU, from Alexander
Duyck.
10) Fix memory allocation alignment and congestion map corruption in
RDS, from Shamir Rabinovitch.
11) Fix default qdisc regression in tuntap driver, from Jason Wang.
Please pull, thanks a lot!
The following changes since commit 05cf8077e54b20dddb756eaa26f3aeb5c38dd3cf:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2016-04-01
20:03:33 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
for you to fetch changes up to 30d237a6c2e9be1bb816fe8e787b88fd7aad833b:
Merge tag 'mac80211-for-davem-2016-04-06' of
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (2016-04-08
16:41:28 -0400)
----------------------------------------------------------------
Alexander Duyck (3):
e1000: Do not overestimate descriptor counts in Tx pre-check
e1000: Double Tx descriptors needed check for 82544
GRE: Disable segmentation offloads w/ CSUM and we are encapsulated via FOU
Arik Nemtsov (3):
mac80211: TDLS: always downgrade invalid chandefs
mac80211: TDLS: change BW calculation for WIDER_BW peers
mac80211: recalc min_def chanctx even when chandef is identical
Bastien Philbert (1):
bridge: Fix incorrect variable assignment on error path in br_sysfs_addbr
Ben Greear (1):
mac80211: ensure no limits on station rhashtable
Bjorn Helgaas (1):
Revert "netpoll: Fix extra refcount release in netpoll_cleanup()"
Dave Jones (1):
af_packet: tone down the Tx-ring unsupported spew.
David S. Miller (3):
Merge branch 'master' of git://git.kernel.org/.../jkirsher/net-queue
Revert "bridge: Fix incorrect variable assignment on error path in
br_sysfs_addbr"
Merge tag 'mac80211-for-davem-2016-04-06' of
git://git.kernel.org/.../jberg/mac80211
Dexuan Cui (1):
net: add the AF_KCM entries to family name tables
Emmanuel Grumbach (2):
mac80211: don't send deferred frames outside the SP
mac80211: close the SP when we enqueue frames during the SP
Felix Fietkau (1):
mac80211: fix AP buffered multicast frames with queue control and txq
Giuseppe CAVALLARO (1):
stmmac: fix adjust link call in case of a switch is attached
Haishuang Yan (2):
ipv4: l2tp: fix a potential issue in l2tp_ip_recv
ipv6: l2tp: fix a potential issue in l2tp_ip6_recv
Hariprasad Shenai (1):
cxgb4: Add pci device id for chelsio t520-cr adapter
Ilan Peer (1):
mac80211: Fix BW upgrade for TDLS peers
Jakub Sitnicki (1):
ipv6: Count in extension headers in skb->network_header
Jason Wang (1):
tuntap: restore default qdisc
Jeff Mahoney (1):
mac80211: fix "warning: ‘target_metric’ may be used uninitialized"
Jesse Brandeburg (1):
i40e: fix errant PCIe bandwidth message
Jiri Benc (1):
MAINTAINERS: intel-wired-lan list is moderated
Johannes Berg (1):
mac80211: properly deal with station hashtable insert errors
Jorgen Hansen (1):
VSOCK: Detach QP check should filter out non matching QPs.
Luis de Bethencourt (2):
mac80211: add doc for RX_FLAG_DUP_VALIDATED flag
mac80211: remove description of dropped member
Marcelo Ricardo Leitner (2):
sctp: flush if we can't fit another DATA chunk
sctp: use list_* in sctp_list_dequeue
Naveen N. Rao (7):
samples/bpf: Fix build breakage with map_perf_test_user.c
samples/bpf: Use llc in PATH, rather than a hardcoded value
samples/bpf: Enable powerpc support
lib/test_bpf: Fix JMP_JSET tests
lib/test_bpf: Add tests for unsigned BPF_JGT
lib/test_bpf: Add test to check for result of 32-bit add that overflows
lib/test_bpf: Add additional BPF_ADD tests
Roopa Prabhu (1):
mpls: find_outdev: check for err ptr in addition to NULL check
Thadeu Lima de Souza Cascardo (1):
ip6_tunnel: set rtnl_link_ops before calling register_netdevice
WANG Cong (1):
net_sched: fix a memory leak in tc action
shamir rabinovitch (2):
RDS: memory allocated must be align to 8
RDS: fix congestion map corruption for PAGE_SIZE > 4k
stephen hemminger (1):
bridge, netem: mark mailing lists as moderated
MAINTAINERS | 6 +-
drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 1 +
drivers/net/ethernet/intel/e1000/e1000_main.c | 21 ++++-
drivers/net/ethernet/intel/i40e/i40e_main.c | 1 +
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 22 +++--
drivers/net/tun.c | 4 +-
include/linux/netdevice.h | 5 +-
include/net/act_api.h | 1 +
include/net/mac80211.h | 2 +
include/net/sctp/sctp.h | 6 +-
lib/test_bpf.c | 229
+++++++++++++++++++++++++++++++++++++++++++++++++++-
net/core/dev.c | 1 +
net/core/netpoll.c | 3 +-
net/core/sock.c | 9 ++-
net/ipv4/fou.c | 6 ++
net/ipv4/gre_offload.c | 8 ++
net/ipv4/ip_gre.c | 13 ++-
net/ipv6/ip6_output.c | 8 +-
net/ipv6/ip6_tunnel.c | 2 +-
net/l2tp/l2tp_ip.c | 8 +-
net/l2tp/l2tp_ip6.c | 8 +-
net/mac80211/chan.c | 4 +-
net/mac80211/ieee80211_i.h | 4 +
net/mac80211/mesh_hwmp.c | 2 +-
net/mac80211/sta_info.c | 14 ++--
net/mac80211/sta_info.h | 1 -
net/mac80211/tdls.c | 43 ++++++++--
net/mac80211/tx.c | 13 ++-
net/mac80211/vht.c | 30 +++++--
net/mpls/af_mpls.c | 3 +
net/packet/af_packet.c | 2 +-
net/rds/ib_recv.c | 2 +-
net/rds/page.c | 4 +-
net/sctp/output.c | 3 +-
net/vmw_vsock/vmci_transport.c | 4 +-
samples/bpf/Makefile | 12 +--
samples/bpf/bpf_helpers.h | 26 ++++++
samples/bpf/map_perf_test_user.c | 1 +
samples/bpf/spintest_kern.c | 2 +-
samples/bpf/tracex2_kern.c | 4 +-
samples/bpf/tracex4_kern.c | 2 +-
41 files changed, 448 insertions(+), 92 deletions(-)
