Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 9ef11ceb
    Linus Torvalds authored
    Pull networking fixes from David Miller:
    
     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.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits)
      bridge, netem: mark mailing lists as moderated
      tuntap: restore default qdisc
      mpls: find_outdev: check for err ptr in addition to NULL check
      ipv6: Count in extension headers in skb->network_header
      RDS: fix congestion map corruption for PAGE_SIZE > 4k
      RDS: memory allocated must be align to 8
      GRE: Disable segmentation offloads w/ CSUM and we are encapsulated via FOU
      net: add the AF_KCM entries to family name tables
      MAINTAINERS: intel-wired-lan list is moderated
      lib/test_bpf: Add additional BPF_ADD tests
      lib/test_bpf: Add test to check for result of 32-bit add that overflows
      lib/test_bpf: Add tests for unsigned BPF_JGT
      lib/test_bpf: Fix JMP_JSET tests
      VSOCK: Detach QP check should filter out non matching QPs.
      stmmac: fix adjust link call in case of a switch is attached
      af_packet: tone down the Tx-ring unsupported spew.
      net_sched: fix a memory leak in tc action
      samples/bpf: Enable powerpc support
      samples/bpf: Use llc in PATH, rather than a hardcoded value
      samples/bpf: Fix build breakage with map_perf_test_user.c
      ...
    9ef11ceb