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

Commit 4cf18463 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) stmmac_drv_probe() can race with stmmac_open() because we register
    the netdevice too early. Fix from Florian Fainelli.

 2) UFO handling in __ip6_append_data() and ip6_finish_output() use
    different tests for deciding whether a frame will be fragmented or
    not, put them in sync. Fix from Zheng Li.

 3) The rtnetlink getstats handlers need to validate that the netlink
    request is large enough, fix from Mathias Krause.

 4) Use after free in mlx4 driver, from Jack Morgenstein.

 5) Fix setting of garbage UID value in sockets during setattr() calls,
    from Eric Biggers.

 6) Packet drop_monitor doesn't format the netlink messages properly
    such that nlmsg_next fails to work, fix from Reiter Wolfgang.

 7) Fix handling of wildcard addresses in l2tp lookups, from Guillaume
    Nault.

 8) __skb_flow_dissect() can crash on pptp packets, from Ian Kumlien.

 9) IGMP code doesn't reset group query timers properly, from Michal
    Tesar.

10) Fix overzealous MAIN/LOCAL route table combining in ipv4, from
    Alexander Duyck.

11) vxlan offload check needs to be more strict in be2net driver, from
    Sabrina Dubroca.

12) Moving l3mdev to packet hooks lost RX stat counters unintentionally,
    fix from David Ahern.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (52 commits)
  sh_eth: enable RX descriptor word 0 shift on SH7734
  sfc: don't report RX hash keys to ethtool when RSS wasn't enabled
  dpaa_eth: Initialize CGR structure before init
  dpaa_eth: cleanup after init_phy() failure
  net: systemport: Pad packet before inserting TSB
  net: systemport: Utilize skb_put_padto()
  LiquidIO VF: s/select/imply/ for PTP_1588_CLOCK
  libcxgb: fix error check for ip6_route_output()
  net: usb: asix_devices: add .reset_resume for USB PM
  net: vrf: Add missing Rx counters
  drop_monitor: consider inserted data in genlmsg_end
  benet: stricter vxlan offloading check in be_features_check
  ipv4: Do not allow MAIN to be alias for new LOCAL w/ custom rules
  net: macb: Updated resource allocation function calls to new version of API.
  net: stmmac: dwmac-oxnas: use generic pm implementation
  net: stmmac: dwmac-oxnas: fix fixed-link-phydev leaks
  net: stmmac: dwmac-oxnas: fix of-node leak
  Documentation/networking: fix typo in mpls-sysctl
  igmp: Make igmp group member RFC 3376 compliant
  flow_dissector: Update pptp handling to avoid null pointer deref.
  ...
parents 62f8c405 71eae1ca

Documentation/networking/mpls-sysctl.txt

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ platform_labels - INTEGER 
	possible to configure forwarding for label values equal to or

	greater than the number of platform labels.



	A dense utliziation of the entries in the platform label table

	is possible and expected aas the platform labels are locally

	A dense utilization of the entries in the platform label table

	is possible and expected as the platform labels are locally

	allocated.



	If the number of platform label table entries is set to 0 no

drivers/infiniband/hw/mlx4/main.c

+12 −2
Original line number Diff line number Diff line
@@ -1682,9 +1682,19 @@ static int __mlx4_ib_create_flow(struct ib_qp *qp, struct ib_flow_attr *flow_att 
		size += ret;

	}



	if (mlx4_is_master(mdev->dev) && flow_type == MLX4_FS_REGULAR &&

	    flow_attr->num_of_specs == 1) {

		struct _rule_hw *rule_header = (struct _rule_hw *)(ctrl + 1);

		enum ib_flow_spec_type header_spec =

			((union ib_flow_spec *)(flow_attr + 1))->type;



		if (header_spec == IB_FLOW_SPEC_ETH)

			mlx4_handle_eth_header_mcast_prio(ctrl, rule_header);

	}



	ret = mlx4_cmd_imm(mdev->dev, mailbox->dma, reg_id, size >> 2, 0,

			   MLX4_QP_FLOW_STEERING_ATTACH, MLX4_CMD_TIME_CLASS_A,

			   MLX4_CMD_WRAPPED);

			   MLX4_CMD_NATIVE);

	if (ret == -ENOMEM)

		pr_err("mcg table is full. Fail to register network rule.\n");

	else if (ret == -ENXIO)
@@ -1701,7 +1711,7 @@ static int __mlx4_ib_destroy_flow(struct mlx4_dev *dev, u64 reg_id) 
	int err;

	err = mlx4_cmd(dev, reg_id, 0, 0,

		       MLX4_QP_FLOW_STEERING_DETACH, MLX4_CMD_TIME_CLASS_A,

		       MLX4_CMD_WRAPPED);

		       MLX4_CMD_NATIVE);

	if (err)

		pr_err("Fail to detach network rule. registration id = 0x%llx\n",

		       reg_id);

drivers/net/ethernet/broadcom/bcmsysport.c

+11 −12
Original line number Diff line number Diff line
@@ -1012,15 +1012,6 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb, 
		goto out;

	}



	/* Insert TSB and checksum infos */

	if (priv->tsb_en) {

		skb = bcm_sysport_insert_tsb(skb, dev);

		if (!skb) {

			ret = NETDEV_TX_OK;

			goto out;

		}

	}



	/* The Ethernet switch we are interfaced with needs packets to be at

	 * least 64 bytes (including FCS) otherwise they will be discarded when

	 * they enter the switch port logic. When Broadcom tags are enabled, we
@@ -1028,13 +1019,21 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb, 
	 * (including FCS and tag) because the length verification is done after

	 * the Broadcom tag is stripped off the ingress packet.

	 */

	if (skb_padto(skb, ETH_ZLEN + ENET_BRCM_TAG_LEN)) {

	if (skb_put_padto(skb, ETH_ZLEN + ENET_BRCM_TAG_LEN)) {

		ret = NETDEV_TX_OK;

		goto out;

	}



	skb_len = skb->len < ETH_ZLEN + ENET_BRCM_TAG_LEN ?

			ETH_ZLEN + ENET_BRCM_TAG_LEN : skb->len;

	/* Insert TSB and checksum infos */

	if (priv->tsb_en) {

		skb = bcm_sysport_insert_tsb(skb, dev);

		if (!skb) {

			ret = NETDEV_TX_OK;

			goto out;

		}

	}



	skb_len = skb->len;



	mapping = dma_map_single(kdev, skb->data, skb_len, DMA_TO_DEVICE);

	if (dma_mapping_error(kdev, mapping)) {

drivers/net/ethernet/cadence/macb_pci.c

+10 −17
Original line number Diff line number Diff line 
/**

 * macb_pci.c - Cadence GEM PCI wrapper.

 * Cadence GEM PCI wrapper.

 *

 * Copyright (C) 2016 Cadence Design Systems - http://www.cadence.com

 *
@@ -45,32 +45,27 @@ static int macb_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	struct macb_platform_data plat_data;

	struct resource res[2];



	/* sanity check */

	if (!id)

		return -EINVAL;



	/* enable pci device */

	err = pci_enable_device(pdev);

	err = pcim_enable_device(pdev);

	if (err < 0) {

		dev_err(&pdev->dev, "Enabling PCI device has failed: 0x%04X",

			err);

		return -EACCES;

		dev_err(&pdev->dev, "Enabling PCI device has failed: %d", err);

		return err;

	}



	pci_set_master(pdev);



	/* set up resources */

	memset(res, 0x00, sizeof(struct resource) * ARRAY_SIZE(res));

	res[0].start = pdev->resource[0].start;

	res[0].end = pdev->resource[0].end;

	res[0].start = pci_resource_start(pdev, 0);

	res[0].end = pci_resource_end(pdev, 0);

	res[0].name = PCI_DRIVER_NAME;

	res[0].flags = IORESOURCE_MEM;

	res[1].start = pdev->irq;

	res[1].start = pci_irq_vector(pdev, 0);

	res[1].name = PCI_DRIVER_NAME;

	res[1].flags = IORESOURCE_IRQ;



	dev_info(&pdev->dev, "EMAC physical base addr = 0x%p\n",

		 (void *)(uintptr_t)pci_resource_start(pdev, 0));

	dev_info(&pdev->dev, "EMAC physical base addr: %pa\n",

		 &res[0].start);



	/* set up macb platform data */

	memset(&plat_data, 0, sizeof(plat_data));
@@ -100,7 +95,7 @@ static int macb_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	plat_info.num_res = ARRAY_SIZE(res);

	plat_info.data = &plat_data;

	plat_info.size_data = sizeof(plat_data);

	plat_info.dma_mask = DMA_BIT_MASK(32);

	plat_info.dma_mask = pdev->dma_mask;



	/* register platform device */

	plat_dev = platform_device_register_full(&plat_info);
@@ -120,7 +115,6 @@ static int macb_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	clk_unregister(plat_data.pclk);



err_pclk_register:

	pci_disable_device(pdev);

	return err;

}
@@ -130,7 +124,6 @@ static void macb_remove(struct pci_dev *pdev) 
	struct macb_platform_data *plat_data = dev_get_platdata(&plat_dev->dev);



	platform_device_unregister(plat_dev);

	pci_disable_device(pdev);

	clk_unregister(plat_data->pclk);

	clk_unregister(plat_data->hclk);

}

drivers/net/ethernet/cavium/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ config OCTEON_MGMT_ETHERNET 
config LIQUIDIO_VF

	tristate "Cavium LiquidIO VF support"

	depends on 64BIT && PCI_MSI

	select PTP_1588_CLOCK

	imply PTP_1588_CLOCK

	---help---

	  This driver supports Cavium LiquidIO Intelligent Server Adapter

	  based on CN23XX chips.