Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f5daf2a 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) Prevent XFRM per-cpu counter updates for one namespace from being
    applied to another namespace.  Fix from DanS treetman.

 2) Fix RCU de-reference in iwl_mvm_get_key_sta_id(), from Johannes
    Berg.

 3) Remove ethernet header assumption in nft_do_chain_netdev(), from
    Pablo Neira Ayuso.

 4) Fix cpsw PHY ident with multiple slaves and fixed-phy, from Pascal
    Speck.

 5) Fix use after free in sixpack_close and mkiss_close.

 6) Fix VXLAN fw assertion on bnx2x, from Yuval Mintz.

 7) natsemi doesn't check for DMA mapping errors, from Alexey
    Khoroshilov.

 8) Fix inverted test in ip6addrlbl_get(), from ANdrey Ryabinin.

 9) Missing initialization of needed_headroom in geneve tunnel driver,
    from Paolo Abeni.

10) Fix conntrack template leak in openvswitch, from Joe Stringer.

11) Mission initialization of wq->flags in sock_alloc_inode(), from
    Nicolai Stange.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (35 commits)
  sctp: sctp should release assoc when sctp_make_abort_user return NULL in sctp_close
  net, socket, socket_wq: fix missing initialization of flags
  drivers: net: cpsw: fix error return code
  openvswitch: Fix template leak in error cases.
  sctp: label accepted/peeled off sockets
  sctp: use GFP_USER for user-controlled kmalloc
  qlcnic: fix a loop exit condition better
  net: cdc_ncm: avoid changing RX/TX buffers on MTU changes
  geneve: initialize needed_headroom
  ipv6: honor ifindex in case we receive ll addresses in router advertisements
  addrconf: always initialize sysctl table data
  ipv6/addrlabel: fix ip6addrlbl_get()
  switchdev: bridge: Pass ageing time as clock_t instead of jiffies
  sh_eth: fix 16-bit descriptor field access endianness too
  veth: don’t modify ip_summed; doing so treats packets with bad checksums as good.
  net: usb: cdc_ncm: Adding Dell DW5813 LTE AT&T Mobile Broadband Card
  net: usb: cdc_ncm: Adding Dell DW5812 LTE Verizon Mobile Broadband Card
  natsemi: add checks for dma mapping errors
  rhashtable: Kill harmless RCU warning in rhashtable_walk_init
  openvswitch: correct encoding of set tunnel action attributes
  ...
parents c6169202 068d8bd3

Documentation/devicetree/bindings/net/cpsw.txt

+3 −3
Original line number Diff line number Diff line
@@ -40,18 +40,18 @@ Optional properties: 


Slave Properties:

Required properties:

- phy_id		: Specifies slave phy id

- phy-mode		: See ethernet.txt file in the same directory



Optional properties:

- dual_emac_res_vlan	: Specifies VID to be used to segregate the ports

- mac-address		: See ethernet.txt file in the same directory

- phy_id		: Specifies slave phy id

- phy-handle		: See ethernet.txt file in the same directory



Slave sub-nodes:

- fixed-link		: See fixed-link.txt file in the same directory

			  Either the properties phy_id and phy-mode,

			  or the sub-node fixed-link can be specified

			  Either the property phy_id, or the sub-node

			  fixed-link can be specified



Note: "ti,hwmods" field is used to fetch the base address and irq

resources from TI, omap hwmod data base during device registration.

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+13 −9
Original line number Diff line number Diff line
@@ -3430,25 +3430,29 @@ static u32 bnx2x_xmit_type(struct bnx2x *bp, struct sk_buff *skb) 
	return rc;

}



#if (MAX_SKB_FRAGS >= MAX_FETCH_BD - 3)

/* VXLAN: 4 = 1 (for linear data BD) + 3 (2 for PBD and last BD) */

#define BNX2X_NUM_VXLAN_TSO_WIN_SUB_BDS         4



/* Regular: 3 = 1 (for linear data BD) + 2 (for PBD and last BD) */

#define BNX2X_NUM_TSO_WIN_SUB_BDS               3



#if (MAX_SKB_FRAGS >= MAX_FETCH_BD - BDS_PER_TX_PKT)

/* check if packet requires linearization (packet is too fragmented)

   no need to check fragmentation if page size > 8K (there will be no

   violation to FW restrictions) */

static int bnx2x_pkt_req_lin(struct bnx2x *bp, struct sk_buff *skb,

			     u32 xmit_type)

{

	int to_copy = 0;

	int hlen = 0;

	int first_bd_sz = 0;

	int first_bd_sz = 0, num_tso_win_sub = BNX2X_NUM_TSO_WIN_SUB_BDS;

	int to_copy = 0, hlen = 0;



	/* 3 = 1 (for linear data BD) + 2 (for PBD and last BD) */

	if (skb_shinfo(skb)->nr_frags >= (MAX_FETCH_BD - 3)) {

	if (xmit_type & XMIT_GSO_ENC)

		num_tso_win_sub = BNX2X_NUM_VXLAN_TSO_WIN_SUB_BDS;



	if (skb_shinfo(skb)->nr_frags >= (MAX_FETCH_BD - num_tso_win_sub)) {

		if (xmit_type & XMIT_GSO) {

			unsigned short lso_mss = skb_shinfo(skb)->gso_size;

			/* Check if LSO packet needs to be copied:

			   3 = 1 (for headers BD) + 2 (for PBD and last BD) */

			int wnd_size = MAX_FETCH_BD - 3;

			int wnd_size = MAX_FETCH_BD - num_tso_win_sub;

			/* Number of windows to check */

			int num_wnds = skb_shinfo(skb)->nr_frags - wnd_size;

			int wnd_idx = 0;

drivers/net/ethernet/emulex/benet/be_main.c

+3 −1
Original line number Diff line number Diff line
@@ -3299,8 +3299,10 @@ static int be_msix_register(struct be_adapter *adapter) 


	return 0;

err_msix:

	for (i--, eqo = &adapter->eq_obj[i]; i >= 0; i--, eqo--)

	for (i--; i >= 0; i--) {

		eqo = &adapter->eq_obj[i];

		free_irq(be_msix_vec_get(adapter, eqo), eqo);

	}

	dev_warn(&adapter->pdev->dev, "MSIX Request IRQ failed - err %d\n",

		 status);

	be_msix_disable(adapter);

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

+7 −0
Original line number Diff line number Diff line
@@ -242,6 +242,13 @@ void mlx4_en_init_timestamp(struct mlx4_en_dev *mdev) 
	unsigned long flags;

	u64 ns, zero = 0;



	/* mlx4_en_init_timestamp is called for each netdev.

	 * mdev->ptp_clock is common for all ports, skip initialization if

	 * was done for other port.

	 */

	if (mdev->ptp_clock)

		return;



	rwlock_init(&mdev->clock_lock);



	memset(&mdev->cycles, 0, sizeof(mdev->cycles));

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

+0 −7
Original line number Diff line number Diff line
@@ -232,9 +232,6 @@ static void mlx4_en_remove(struct mlx4_dev *dev, void *endev_ptr) 
		if (mdev->pndev[i])

			mlx4_en_destroy_netdev(mdev->pndev[i]);



	if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS)

		mlx4_en_remove_timestamp(mdev);



	flush_workqueue(mdev->workqueue);

	destroy_workqueue(mdev->workqueue);

	(void) mlx4_mr_free(dev, &mdev->mr);
@@ -320,10 +317,6 @@ static void *mlx4_en_add(struct mlx4_dev *dev) 
	mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH)

		mdev->port_cnt++;



	/* Initialize time stamp mechanism */

	if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS)

		mlx4_en_init_timestamp(mdev);



	/* Set default number of RX rings*/

	mlx4_en_set_num_rx_rings(mdev);