Commit f28f20da authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

Pull networking fixes from David Miller:

 1) Handle v4/v6 mixed sockets properly in soreuseport, from Craig
    Gallak.

 2) Bug fixes for the new macsec facility (missing kmalloc NULL checks,
    missing locking around netdev list traversal, etc.) from Sabrina
    Dubroca.

 3) Fix handling of host routes on ifdown in ipv6, from David Ahern.

 4) Fix double-fdput in bpf verifier.  From Jann Horn.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (31 commits)
  bpf: fix double-fdput in replace_map_fd_with_map_ptr()
  net: ipv6: Delete host routes on an ifdown
  Revert "ipv6: Revert optional address flusing on ifdown."
  net/mlx4_en: fix spurious timestamping callbacks
  net: dummy: remove note about being Y by default
  cxgbi: fix uninitialized flowi6
  ipv6: Revert optional address flusing on ifdown.
  ipv4/fib: don't warn when primary address is missing if in_dev is dead
  net/mlx5: Add pci shutdown callback
  net/mlx5_core: Remove static from local variable
  net/mlx5e: Use vport MTU rather than physical port MTU
  net/mlx5e: Fix minimum MTU
  net/mlx5e: Device's mtu field is u16 and not int
  net/mlx5_core: Add ConnectX-5 to list of supported devices
  net/mlx5e: Fix MLX5E_100BASE_T define
  net/mlx5_core: Fix soft lockup in steering error flow
  qlcnic: Update version to 5.3.64
  net: stmmac: socfpga: Remove re-registration of reset controller
  macsec: fix netlink attribute validation
  macsec: add missing macsec prefix in uapi
  ...
parents 91ea692f 8358b02b

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -11071,6 +11071,15 @@ S: Maintained 
F:	drivers/clk/ti/

F:	include/linux/clk/ti.h



TI ETHERNET SWITCH DRIVER (CPSW)

M:	Mugunthan V N <mugunthanvnm@ti.com>

R:	Grygorii Strashko <grygorii.strashko@ti.com>

L:	linux-omap@vger.kernel.org

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/ti/cpsw*

F:	drivers/net/ethernet/ti/davinci*



TI FLASH MEDIA INTERFACE DRIVER

M:	Alex Dubov <oakad@yahoo.com>

S:	Maintained

drivers/infiniband/hw/mlx5/main.c

+2 −2
Original line number Diff line number Diff line
@@ -671,8 +671,8 @@ static int mlx5_query_hca_port(struct ib_device *ibdev, u8 port, 
	struct mlx5_ib_dev *dev = to_mdev(ibdev);

	struct mlx5_core_dev *mdev = dev->mdev;

	struct mlx5_hca_vport_context *rep;

	int max_mtu;

	int oper_mtu;

	u16 max_mtu;

	u16 oper_mtu;

	int err;

	u8 ib_link_width_oper;

	u8 vl_hw_cap;

drivers/net/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -62,9 +62,8 @@ config DUMMY 
	  this device is consigned into oblivion) with a configurable IP

	  address. It is most commonly used in order to make your currently

	  inactive SLIP address seem like a real address for local programs.

	  If you use SLIP or PPP, you might want to say Y here. Since this

	  thing often comes in handy, the default is Y. It won't enlarge your

	  kernel either. What a deal. Read about it in the Network

	  If you use SLIP or PPP, you might want to say Y here. It won't

	  enlarge your kernel. What a deal. Read about it in the Network

	  Administrator's Guide, available from

	  <http://www.tldp.org/docs.html#guide>.

drivers/net/ethernet/mellanox/mlx4/en_tx.c

+4 −2
Original line number Diff line number Diff line
@@ -405,7 +405,6 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev, 
	u32 packets = 0;

	u32 bytes = 0;

	int factor = priv->cqe_factor;

	u64 timestamp = 0;

	int done = 0;

	int budget = priv->tx_work_limit;

	u32 last_nr_txbb;
@@ -445,9 +444,12 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev, 
		new_index = be16_to_cpu(cqe->wqe_index) & size_mask;



		do {

			u64 timestamp = 0;



			txbbs_skipped += last_nr_txbb;

			ring_index = (ring_index + last_nr_txbb) & size_mask;

			if (ring->tx_info[ring_index].ts_requested)



			if (unlikely(ring->tx_info[ring_index].ts_requested))

				timestamp = mlx4_en_get_cqe_ts(cqe);



			/* free next descriptor */

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −1
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ enum mlx5e_link_mode { 
	MLX5E_100GBASE_KR4	 = 22,

	MLX5E_100GBASE_LR4	 = 23,

	MLX5E_100BASE_TX	 = 24,

	MLX5E_100BASE_T		 = 25,

	MLX5E_1000BASE_T	 = 25,

	MLX5E_10GBASE_T		 = 26,

	MLX5E_25GBASE_CR	 = 27,

	MLX5E_25GBASE_KR	 = 28,

CRA Git | Maintained and supported by SUSTech CRA and CCSE