Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 698ea54d
    Linus Torvalds authored
    Pull networking fixes from David Miller:
    
     1) nfnetlink timestamp taken from wrong skb, fix from Florian Westphal.
    
     2) Revert some msleep conversions in rtlwifi as these spots are in
        atomic context, from Larry Finger.
    
     3) Validate that NFTA_SET_TABLE attribute is actually specified when we
        call nf_tables_getset().  From Phil Turnbull.
    
     4) Don't do mdio_reset in stmmac driver with spinlock held as that can
        sleep, from Vincent Palatin.
    
     5) sk_filter() does things other than run a BPF filter, so we should
        not elide it's call just because sk->sk_filter is NULL.  Fix from
        Eric Dumazet.
    
     6) Fix missing backlog updates in several packet schedulers, from Cong
        Wang.
    
     7) bnx2x driver should allow VLAN add/remove while the interface is
        down, from Michal Schmidt.
    
     8) Several RDS/TCP race fixes from Sowmini Varadhan.
    
     9) fq_codel scheduler doesn't return correct queue length in dumps,
        from Eric Dumazet.
    
    10) Fix TCP stats for tail loss probe and early retransmit in ipv6, from
        Yuchung Cheng.
    
    11) Properly initialize udp_tunnel_socket_cfg in l2tp_tunnel_create(),
        from Guillaume Nault.
    
    12) qfq scheduler leaks SKBs if a kzalloc fails, fix from Florian
        Westphal.
    
    13) sock_fprog passed into PACKET_FANOUT_DATA needs compat handling,
        from Willem de Bruijn.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (85 commits)
      vmxnet3: segCnt can be 1 for LRO packets
      packet: compat support for sock_fprog
      stmmac: fix parameter to dwmac4_set_umac_addr()
      net/mlx5e: Fix blue flame quota logic
      net/mlx5e: Use ndo_stop explicitly at shutdown flow
      net/mlx5: E-Switch, always set mc_promisc for allmulti vports
      net/mlx5: E-Switch, Modify node guid on vf set MAC
      net/mlx5: E-Switch, Fix vport enable flow
      net/mlx5: E-Switch, Use the correct error check on returned pointers
      net/mlx5: E-Switch, Use the correct free() function
      net/mlx5: Fix E-Switch flow steering capabilities check
      net/mlx5: Fix flow steering NIC capabilities check
      net/mlx5: Fix root flow table update
      net/mlx5: Fix MLX5_CMD_OP_MAX to be defined correctly
      net/mlx5: Fix masking of reserved bits in XRCD number
      net/mlx5: Fix the size of modify QP mailbox
      mlxsw: spectrum: Don't sleep during ndo_get_phys_port_name()
      mlxsw: spectrum: Make split flow match firmware requirements
      wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel
      cfg80211: remove get/set antenna and tx power warnings
      ...
    698ea54d