Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 22f83798
    Linus Torvalds authored
    Pull networking updates from David Miller:
     "Much more accumulated than I would have liked due to an unexpected
      bout with a nasty flu:
    
       1) AH and ESP input don't set ECN field correctly because the
          transport head of the SKB isn't set correctly, fix from Li
          RongQing.
    
       2) If netfilter conntrack zones are disabled, we can return an
          uninitialized variable instead of the proper error code.  Fix from
          Borislav Petkov.
    
       3) Fix double SKB free in ath9k driver beacon handling, from Felix
          Feitkau.
    
       4) Remove bogus assumption about netns cleanup ordering in
          nf_conntrack, from Pablo Neira Ayuso.
    
       5) Remove a bogus BUG_ON in the new TCP fastopen code, from Eric
          Dumazet.  It uses spin_is_locked() in it's test and is therefore
          unsuitable for UP.
    
       6) Fix SELINUX labelling regressions added by the tuntap multiqueue
          changes, from Paul Moore.
    
       7) Fix CRC errors with jumbo frame receive in tg3 driver, from Nithin
          Nayak Sujir.
    
       8) CXGB4 driver sets interrupt coalescing parameters only on first
          queue, rather than all of them.  Fix from Thadeu Lima de Souza
          Cascardo.
    
       9) Fix regression in the dispatch of read/write registers in dm9601
          driver, from Tushar Behera.
    
      10) ipv6_append_data miscalculates header length, from Romain KUNTZ.
    
      11) Fix PMTU handling regressions on ipv4 routes, from Steffen
          Klassert, Timo Teräs, and Julian Anastasov.
    
      12) In 3c574_cs driver, add necessary parenthesis to "x << y & z"
          expression.  From Nickolai Zeldovich.
    
      13) macvlan_get_size() causes underallocation netlink message space,
          fix from Eric Dumazet.
    
      14) Avoid division by zero in xfrm_replay_advance_bmp(), from Nickolai
          Zeldovich.  Amusingly the zero check was already there, we were
          just performing it after the modulus :-)
    
      15) Some more splice bug fixes from Eric Dumazet, which fix things
          mostly eminating from how we now more aggressively use high-order
          pages in SKBs.
    
      16) Fix size calculation bug when freeing hash tables in the IPSEC
          xfrm code, from Michal Kubecek.
    
      17) Fix PMTU event propagation into socket cached routes, from Steffen
          Klassert.
    
      18) Fix off by one in TX buffer release in netxen driver, from Eric
          Dumazet.
    
      19) Fix rediculous memory allocation requirements introduced by the
          tuntap multiqueue changes, from Jason Wang.
    
      20) Remove bogus AMD platform workaround in r8169 driver that causes
          major problems in normal operation, from Timo Teräs.
    
      21) virtio-net set affinity and select queue don't handle
          discontiguous cpu numbers properly, fix from Wanlong Gao.
    
      22) Fix a route refcounting issue in loopback driver, from Eric
          Dumazet.  There's a similar fix coming that we might add to the
          macvlan driver as well.
    
      23) Fix SKB leaks in batman-adv's distributed arp table code, from
          Matthias Schiffer.
    
      24) r8169 driver gives descriptor ownership back the hardware before
          we're done reading the VLAN tag out of it, fix from Francois
          Romieu.
    
      25) Checksums not calculated properly in GRE tunnel driver fix from
          Pravin B Shelar.
    
    26) Fix SCTP memory leak on namespace exit."
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (101 commits)
      dm9601: support dm9620 variant
      SCTP: Free the per-net sysctl table on net exit. v2
      net: phy: icplus: fix broken INTR pin settings
      net: phy: icplus: Use the RGMII interface mode to configure clock delays
      IP_GRE: Fix kernel panic in IP_GRE with GRE csum.
      sctp: set association state to established in dupcook_a handler
      ip6mr: limit IPv6 MRT_TABLE identifiers
      r8169: fix vlan tag read ordering.
      net: cdc_ncm: use IAD provided by the USB core
      batman-adv: filter ARP packets with invalid MAC addresses in DAT
      batman-adv: check for more types of invalid IP addresses in DAT
      batman-adv: fix skb leak in batadv_dat_snoop_incoming_arp_reply()
      net: loopback: fix a dst refcounting issue
      virtio-net: reset virtqueue affinity when doing cpu hotplug
      virtio-net: split out clean affinity function
      virtio-net: fix the set affinity bug when CPU IDs are not consecutive
      can: pch_can: fix invalid error codes
      can: ti_hecc: fix invalid error codes
      can: c_can: fix invalid error codes
      r8169: remove the obsolete and incorrect AMD workaround
      ...
    22f83798