Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · f887c21e
    Linus Torvalds authored
    Pull networking fixes from David Miller:
     "Mostly small bits scattered all over the place, which is usually how
      things go this late in the -rc series.
    
       1) Proper driver init device resets in bnx2, from Baoquan He.
    
       2) Fix accounting overflow in __tcp_retransmit_skb(),
          sk_forward_alloc, and ip_idents_reserve, from Eric Dumazet.
    
       3) Fix crash in bna driver ethtool stats handling, from Ivan Vecera.
    
       4) Missing check of skb_linearize() return value in mac80211, from
          Johannes Berg.
    
       5) Endianness fix in nf_table_trace dumps, from Liping Zhang.
    
       6) SSN comparison fix in SCTP, from Marcelo Ricardo Leitner.
    
       7) Update DSA and b44 MAINTAINERS entries.
    
       8) Make input path of vti6 driver work again, from Nicolas Dichtel.
    
       9) Off-by-one in mlx4, from Sebastian Ott.
    
      10) Fix fallback route lookup handling in ipv6, from Vincent Bernat.
    
      11) Fix stack corruption on probe in qed driver, from Yuval Mintz.
    
      12) PHY init fixes in r8152 from Hayes Wang.
    
      13) Missing SKB free in irda_accept error path, from Phil Turnbull"
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (61 commits)
      tcp: properly account Fast Open SYN-ACK retrans
      tcp: fix under-accounting retransmit SNMP counters
      MAINTAINERS: Update b44 maintainer.
      net: get rid of an signed integer overflow in ip_idents_reserve()
      net/mlx4_core: Fix to clean devlink resources
      net: can: ifi: Configure transmitter delay
      vti6: fix input path
      ipmr, ip6mr: return lastuse relative to now
      r8152: disable ALDPS and EEE before setting PHY
      r8152: remove r8153_enable_eee
      r8152: move PHY settings to hw_phy_cfg
      r8152: move enabling PHY
      r8152: move some functions
      cxgb4/cxgb4vf: Allocate more queues for 25G and 100G adapter
      qed: Fix stack corruption on probe
      MAINTAINERS: Add an entry for the core network DSA code
      net: ipv6: fallback to full lookup if table lookup is unsuitable
      net/mlx5: E-Switch, Handle mode change failures
      net/mlx5: E-Switch, Fix error flow in the SRIOV e-switch init code
      net/mlx5: Fix flow counter bulk command out mailbox allocation
      ...
    f887c21e