Skip to content
  • Linus Torvalds's avatar
    dea08e60
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · dea08e60
    Linus Torvalds authored
    Pull networking fixes from David Miller:
     "Looks like a lot, but mostly driver fixes scattered all over as usual.
    
      Of note:
    
       1) Add conditional sched in nf conntrack in cleanup to avoid NMI
          watchdogs.  From Florian Westphal.
    
       2) Fix deadlock in nfnetlink cttimeout, also from Floarian.
    
       3) Fix handling of slaves in bonding ARP monitor validation, from Jay
          Vosburgh.
    
       4) Callers of ip_cmsg_send() are responsible for freeing IP options,
          some were not doing so.  Fix from Eric Dumazet.
    
       5) Fix per-cpu bugs in mvneta driver, from Gregory CLEMENT.
    
       6) Fix vlan handling in mv88e6xxx DSA driver, from Vivien Didelot.
    
       7) bcm7xxx PHY driver bug fixes from Florian Fainelli.
    
       8) Avoid unaligned accesses to protocol headers wrt.  GRE, from
          Alexander Duyck.
    
       9) SKB leaks and other problems in arc_emac driver, from Alexander
          Kochetkov.
    
      10) tcp_v4_inbound_md5_hash() releases listener socket instead of
          request socket on error path, oops.  Fix from Eric Dumazet.
    
      11) Missing socket release in pppoe_rcv_core() that seems to have
          existed basically forever.  From Guillaume Nault.
    
      12) Missing slave_dev unregister in dsa_slave_create() error path,
          from Florian Fainelli.
    
      13) crypto_alloc_hash() never returns NULL, fix return value check in
          __tcp_alloc_md5sig_pool.  From Insu Yun.
    
      14) Properly expire exception route entries in ipv4, from Xin Long.
    
      15) Fix races in tcp/dccp listener socket dismantle, from Eric
          Dumazet.
    
      16) Don't set IFF_TX_SKB_SHARING in vxlan, geneve, or GRE, it's not
          legal.  These drivers modify the SKB on transmit.  From Jiri Benc.
    
      17) Fix regression in the initialziation of netdev->tx_queue_len.
          From Phil Sutter.
    
      18) Missing unlock in tipc_nl_add_bc_link() error path, from Insu Yun.
    
      19) SCTP port hash sizing does not properly ensure that table is a
          power of two in size.  From Neil Horman.
    
      20) Fix initializing of software copy of MAC address in fmvj18x_cs
          driver, from Ken Kawasaki"
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (129 commits)
      bnx2x: Fix 84833 phy command handler
      bnx2x: Fix led setting for 84858 phy.
      bnx2x: Correct 84858 PHY fw version
      bnx2x: Fix 84833 RX CRC
      bnx2x: Fix link-forcing for KR2
      net: ethernet: davicom: fix devicetree irq resource
      fmvj18x_cs: fix incorrect indexing of dev->dev_addr[] when copying the MAC address
      Driver: Vmxnet3: Update Rx ring 2 max size
      net: netcp: rework the code for get/set sw_data in dma desc
      soc: ti: knav_dma: rename pad in struct knav_dma_desc to sw_data
      net: ti: netcp: restore get/set_pad_info() functionality
      MAINTAINERS: Drop myself as xen netback maintainer
      sctp: Fix port hash table size computation
      can: ems_usb: Fix possible tx overflow
      Bluetooth: hci_core: Avoid mixing up req_complete and req_complete_skb
      net: bcmgenet: Fix internal PHY link state
      af_unix: Don't use continue to re-execute unix_stream_read_generic loop
      unix_diag: fix incorrect sign extension in unix_lookup_by_ino
      bnxt_en: Failure to update PHY is not fatal condition.
      bnxt_en: Remove unnecessary call to update PHY settings.
      ...
    dea08e60
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
    Linus Torvalds authored
    Pull networking fixes from David Miller:
     "Looks like a lot, but mostly driver fixes scattered all over as usual.
    
      Of note:
    
       1) Add conditional sched in nf conntrack in cleanup to avoid NMI
          watchdogs.  From Florian Westphal.
    
       2) Fix deadlock in nfnetlink cttimeout, also from Floarian.
    
       3) Fix handling of slaves in bonding ARP monitor validation, from Jay
          Vosburgh.
    
       4) Callers of ip_cmsg_send() are responsible for freeing IP options,
          some were not doing so.  Fix from Eric Dumazet.
    
       5) Fix per-cpu bugs in mvneta driver, from Gregory CLEMENT.
    
       6) Fix vlan handling in mv88e6xxx DSA driver, from Vivien Didelot.
    
       7) bcm7xxx PHY driver bug fixes from Florian Fainelli.
    
       8) Avoid unaligned accesses to protocol headers wrt.  GRE, from
          Alexander Duyck.
    
       9) SKB leaks and other problems in arc_emac driver, from Alexander
          Kochetkov.
    
      10) tcp_v4_inbound_md5_hash() releases listener socket instead of
          request socket on error path, oops.  Fix from Eric Dumazet.
    
      11) Missing socket release in pppoe_rcv_core() that seems to have
          existed basically forever.  From Guillaume Nault.
    
      12) Missing slave_dev unregister in dsa_slave_create() error path,
          from Florian Fainelli.
    
      13) crypto_alloc_hash() never returns NULL, fix return value check in
          __tcp_alloc_md5sig_pool.  From Insu Yun.
    
      14) Properly expire exception route entries in ipv4, from Xin Long.
    
      15) Fix races in tcp/dccp listener socket dismantle, from Eric
          Dumazet.
    
      16) Don't set IFF_TX_SKB_SHARING in vxlan, geneve, or GRE, it's not
          legal.  These drivers modify the SKB on transmit.  From Jiri Benc.
    
      17) Fix regression in the initialziation of netdev->tx_queue_len.
          From Phil Sutter.
    
      18) Missing unlock in tipc_nl_add_bc_link() error path, from Insu Yun.
    
      19) SCTP port hash sizing does not properly ensure that table is a
          power of two in size.  From Neil Horman.
    
      20) Fix initializing of software copy of MAC address in fmvj18x_cs
          driver, from Ken Kawasaki"
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (129 commits)
      bnx2x: Fix 84833 phy command handler
      bnx2x: Fix led setting for 84858 phy.
      bnx2x: Correct 84858 PHY fw version
      bnx2x: Fix 84833 RX CRC
      bnx2x: Fix link-forcing for KR2
      net: ethernet: davicom: fix devicetree irq resource
      fmvj18x_cs: fix incorrect indexing of dev->dev_addr[] when copying the MAC address
      Driver: Vmxnet3: Update Rx ring 2 max size
      net: netcp: rework the code for get/set sw_data in dma desc
      soc: ti: knav_dma: rename pad in struct knav_dma_desc to sw_data
      net: ti: netcp: restore get/set_pad_info() functionality
      MAINTAINERS: Drop myself as xen netback maintainer
      sctp: Fix port hash table size computation
      can: ems_usb: Fix possible tx overflow
      Bluetooth: hci_core: Avoid mixing up req_complete and req_complete_skb
      net: bcmgenet: Fix internal PHY link state
      af_unix: Don't use continue to re-execute unix_stream_read_generic loop
      unix_diag: fix incorrect sign extension in unix_lookup_by_ino
      bnxt_en: Failure to update PHY is not fatal condition.
      bnxt_en: Remove unnecessary call to update PHY settings.
      ...
Loading