Commit 4f2ba5dc 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 refcounting in xfrm_bundle_lookup() when using a dummy bundle,
    from Steffen Klassert.

 2) Fix crypto header handling in rx data frames in ath10k driver, from
    Vasanthakumar Thiagarajan.

 3) Fix use after free of qdisc when we defer tcp_chain_flush() to a
    workqueue. From Cong Wang.

 4) Fix double free in lapbether driver, from Pan Bian.

 5) Sanitize TUNSETSNDBUF values, from Craig Gallek.

 6) Fix refcounting when addrconf_permanent_addr() calls
    ipv6_del_addr(). From Eric Dumazet.

 7) Fix MTU probing bug in TCP that goes back to 2007, from Eric
    Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  tcp: fix tcp_mtu_probe() vs highest_sack
  ipv6: addrconf: increment ifp refcount before ipv6_del_addr()
  tun/tap: sanitize TUNSETSNDBUF input
  mlxsw: i2c: Fix buffer increment counter for write transaction
  mlxsw: reg: Add high and low temperature thresholds
  MAINTAINERS: Remove Yotam from mlxfw
  MAINTAINERS: Update Yotam's E-mail
  net: hns: set correct return value
  net: lapbether: fix double free
  bpf: remove SK_REDIRECT from UAPI
  net: phy: marvell: Only configure RGMII delays when using RGMII
  xfrm: Fix GSO for IPsec with GRE tunnel.
  tc-testing: fix arg to ip command: -s -> -n
  net_sched: remove tcf_block_put_deferred()
  l2tp: hold tunnel in pppol2tp_connect()
  Revert "ath10k: fix napi_poll budget overflow"
  ath10k: rebuild crypto header in rx data frames
  wcn36xx: Remove unnecessary rcu_read_unlock in wcn36xx_bss_info_changed
  xfrm: Clear sk_dst_cache when applying per-socket policy.
  xfrm: Fix xfrm_dst_cache memleak
parents cb0631fd 2b7cda9c

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -6671,7 +6671,7 @@ F: include/net/ieee802154_netdev.h 
F:	Documentation/networking/ieee802154.txt



IFE PROTOCOL

M:	Yotam Gigi <yotamg@mellanox.com>

M:	Yotam Gigi <yotam.gi@gmail.com>

M:	Jamal Hadi Salim <jhs@mojatatu.com>

F:	net/ife

F:	include/net/ife.h
@@ -8743,7 +8743,7 @@ Q: http://patchwork.ozlabs.org/project/netdev/list/ 
F:	drivers/net/ethernet/mellanox/mlxsw/



MELLANOX FIRMWARE FLASH LIBRARY (mlxfw)

M:	Yotam Gigi <yotamg@mellanox.com>

M:	mlxsw@mellanox.com

L:	netdev@vger.kernel.org

S:	Supported

W:	http://www.mellanox.com
@@ -10890,7 +10890,7 @@ S: Maintained 
F:	drivers/block/ps3vram.c



PSAMPLE PACKET SAMPLING SUPPORT:

M:	Yotam Gigi <yotamg@mellanox.com>

M:	Yotam Gigi <yotam.gi@gmail.com>

S:	Maintained

F:	net/psample

F:	include/net/psample.h

drivers/net/ethernet/hisilicon/hns/hns_enet.c

+2 −2
Original line number Diff line number Diff line
@@ -2369,8 +2369,8 @@ static int hns_nic_dev_probe(struct platform_device *pdev) 
			priv->enet_ver = AE_VERSION_2;



		ae_node = of_parse_phandle(dev->of_node, "ae-handle", 0);

		if (IS_ERR_OR_NULL(ae_node)) {

			ret = PTR_ERR(ae_node);

		if (!ae_node) {

			ret = -ENODEV;

			dev_err(dev, "not find ae-handle\n");

			goto out_read_prop_fail;

		}

drivers/net/ethernet/mellanox/mlxsw/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ mlxsw_i2c_write(struct device *dev, size_t in_mbox_size, u8 *in_mbox, int num, 
		write_tran.len = MLXSW_I2C_ADDR_WIDTH + chunk_size;

		mlxsw_i2c_set_slave_addr(tran_buf, off);

		memcpy(&tran_buf[MLXSW_I2C_ADDR_BUF_SIZE], in_mbox +

		       chunk_size * i, chunk_size);

		       MLXSW_I2C_BLK_MAX * i, chunk_size);



		j = 0;

		end = jiffies + timeout;

drivers/net/ethernet/mellanox/mlxsw/reg.h

+25 −0
Original line number Diff line number Diff line
@@ -5827,6 +5827,29 @@ MLXSW_ITEM32(reg, mtmp, mtr, 0x08, 30, 1); 
 */

MLXSW_ITEM32(reg, mtmp, max_temperature, 0x08, 0, 16);



/* reg_mtmp_tee

 * Temperature Event Enable.

 * 0 - Do not generate event

 * 1 - Generate event

 * 2 - Generate single event

 * Access: RW

 */

MLXSW_ITEM32(reg, mtmp, tee, 0x0C, 30, 2);



#define MLXSW_REG_MTMP_THRESH_HI 0x348	/* 105 Celsius */



/* reg_mtmp_temperature_threshold_hi

 * High threshold for Temperature Warning Event. In 0.125 Celsius.

 * Access: RW

 */

MLXSW_ITEM32(reg, mtmp, temperature_threshold_hi, 0x0C, 0, 16);



/* reg_mtmp_temperature_threshold_lo

 * Low threshold for Temperature Warning Event. In 0.125 Celsius.

 * Access: RW

 */

MLXSW_ITEM32(reg, mtmp, temperature_threshold_lo, 0x10, 0, 16);



#define MLXSW_REG_MTMP_SENSOR_NAME_SIZE 8



/* reg_mtmp_sensor_name
@@ -5843,6 +5866,8 @@ static inline void mlxsw_reg_mtmp_pack(char *payload, u8 sensor_index, 
	mlxsw_reg_mtmp_sensor_index_set(payload, sensor_index);

	mlxsw_reg_mtmp_mte_set(payload, max_temp_enable);

	mlxsw_reg_mtmp_mtr_set(payload, max_temp_reset);

	mlxsw_reg_mtmp_temperature_threshold_hi_set(payload,

						    MLXSW_REG_MTMP_THRESH_HI);

}



static inline void mlxsw_reg_mtmp_unpack(char *payload, unsigned int *p_temp,

drivers/net/phy/marvell.c

+5 −3
Original line number Diff line number Diff line
@@ -681,9 +681,11 @@ static int m88e1116r_config_init(struct phy_device *phydev) 
	if (err < 0)

		return err;



	if (phy_interface_is_rgmii(phydev)) {

		err = m88e1121_config_aneg_rgmii_delays(phydev);

		if (err < 0)

			return err;

	}



	err = genphy_soft_reset(phydev);

	if (err < 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE