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

Commit d1210929 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) Fix excessive stack usage in cxgb4, from Arnd Bergmann.

 2) Missing skb queue lock init in tipc, from Chris Packham.

 3) Fix some regressions in ipv6 flow label handling, from Eric Dumazet.

 4) Elide flow dissection of local packets in FIB rules, from Petar
    Penkov.

 5) Fix TLS support build failure in mlx5, from Tariq Toukab.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (36 commits)
  ppp: mppe: Revert "ppp: mppe: Add softdep to arc4"
  net: dsa: qca8k: replace legacy gpio include
  net: hisilicon: Use devm_platform_ioremap_resource
  cxgb4: reduce kernel stack usage in cudbg_collect_mem_region()
  tipc: ensure head->lock is initialised
  tc-tests: updated skbedit tests
  nfp: flower: ensure ip protocol is specified for L4 matches
  nfp: flower: fix ethernet check on match fields
  net/mlx5e: Provide cb_list pointer when setting up tc block on rep
  net: phy: make exported variables non-static
  net: sched: Fix NULL-pointer dereference in tc_indr_block_ing_cmd()
  davinci_cpdma: don't cast dma_addr_t to pointer
  net: openvswitch: do not update max_headroom if new headroom is equal to old headroom
  net/mlx5e: Convert single case statement switch statements into if statements
  net/mlx5: E-Switch, Reduce ingress acl modify metadata stack usage
  net/mlx5e: Fix unused variable warning when CONFIG_MLX5_ESWITCH is off
  net/mlx5e: Fix compilation error in TLS code
  ipv6: fix static key imbalance in fl_create()
  ipv6: fix potential crash in ip6_datagram_dst_update()
  ipv6: tcp: fix flowlabels reflection for RST packets
  ...
parents 1fa91854 25a09ce7

drivers/net/dsa/qca8k.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/of_platform.h>

#include <linux/if_bridge.h>

#include <linux/mdio.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/etherdevice.h>



#include "qca8k.h"

drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c

+13 −6
Original line number Diff line number Diff line
@@ -1054,14 +1054,12 @@ static void cudbg_t4_fwcache(struct cudbg_init *pdbg_init, 
	}

}



static int cudbg_collect_mem_region(struct cudbg_init *pdbg_init,

				    struct cudbg_buffer *dbg_buff,

static unsigned long cudbg_mem_region_size(struct cudbg_init *pdbg_init,

					   struct cudbg_error *cudbg_err,

					   u8 mem_type)

{

	struct adapter *padap = pdbg_init->adap;

	struct cudbg_meminfo mem_info;

	unsigned long size;

	u8 mc_idx;

	int rc;
@@ -1075,7 +1073,16 @@ static int cudbg_collect_mem_region(struct cudbg_init *pdbg_init, 
	if (rc)

		return rc;



	size = mem_info.avail[mc_idx].limit - mem_info.avail[mc_idx].base;

	return mem_info.avail[mc_idx].limit - mem_info.avail[mc_idx].base;

}



static int cudbg_collect_mem_region(struct cudbg_init *pdbg_init,

				    struct cudbg_buffer *dbg_buff,

				    struct cudbg_error *cudbg_err,

				    u8 mem_type)

{

	unsigned long size = cudbg_mem_region_size(pdbg_init, cudbg_err, mem_type);



	return cudbg_read_fw_mem(pdbg_init, dbg_buff, mem_type, size,

				 cudbg_err);

}

drivers/net/ethernet/hisilicon/hip04_eth.c

+2 −5
Original line number Diff line number Diff line
@@ -899,7 +899,6 @@ static int hip04_mac_probe(struct platform_device *pdev) 
	struct of_phandle_args arg;

	struct net_device *ndev;

	struct hip04_priv *priv;

	struct resource *res;

	int irq;

	int ret;
@@ -912,16 +911,14 @@ static int hip04_mac_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, ndev);

	SET_NETDEV_DEV(ndev, &pdev->dev);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->base = devm_ioremap_resource(d, res);

	priv->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(priv->base)) {

		ret = PTR_ERR(priv->base);

		goto init_fail;

	}



#if defined(CONFIG_HI13X1_GMAC)

	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	priv->sysctrl_base = devm_ioremap_resource(d, res);

	priv->sysctrl_base = devm_platform_ioremap_resource(pdev, 1);

	if (IS_ERR(priv->sysctrl_base)) {

		ret = PTR_ERR(priv->sysctrl_base);

		goto init_fail;

drivers/net/ethernet/hisilicon/hisi_femac.c

+2 −5
Original line number Diff line number Diff line
@@ -781,7 +781,6 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) 
{

	struct device *dev = &pdev->dev;

	struct device_node *node = dev->of_node;

	struct resource *res;

	struct net_device *ndev;

	struct hisi_femac_priv *priv;

	struct phy_device *phy;
@@ -799,15 +798,13 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) 
	priv->dev = dev;

	priv->ndev = ndev;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->port_base = devm_ioremap_resource(dev, res);

	priv->port_base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(priv->port_base)) {

		ret = PTR_ERR(priv->port_base);

		goto out_free_netdev;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	priv->glb_base = devm_ioremap_resource(dev, res);

	priv->glb_base = devm_platform_ioremap_resource(pdev, 1);

	if (IS_ERR(priv->glb_base)) {

		ret = PTR_ERR(priv->glb_base);

		goto out_free_netdev;

drivers/net/ethernet/hisilicon/hix5hd2_gmac.c

+2 −5
Original line number Diff line number Diff line
@@ -1097,7 +1097,6 @@ static int hix5hd2_dev_probe(struct platform_device *pdev) 
	const struct of_device_id *of_id = NULL;

	struct net_device *ndev;

	struct hix5hd2_priv *priv;

	struct resource *res;

	struct mii_bus *bus;

	const char *mac_addr;

	int ret;
@@ -1119,15 +1118,13 @@ static int hix5hd2_dev_probe(struct platform_device *pdev) 
	}

	priv->hw_cap = (unsigned long)of_id->data;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->base = devm_ioremap_resource(dev, res);

	priv->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(priv->base)) {

		ret = PTR_ERR(priv->base);

		goto out_free_netdev;

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	priv->ctrl_base = devm_ioremap_resource(dev, res);

	priv->ctrl_base = devm_platform_ioremap_resource(pdev, 1);

	if (IS_ERR(priv->ctrl_base)) {

		ret = PTR_ERR(priv->ctrl_base);

		goto out_free_netdev;