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

Commit 667f867c 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) Don't allow negative TCP reordering values, from Soheil Hassas
    Yeganeh.

 2) Don't overflow while parsing ipv6 header options, from Craig Gallek.

 3) Handle more cleanly the case where an individual route entry during
    a dump will not fit into the allocated netlink SKB, from David
    Ahern.

 4) Add missing CONFIG_INET dependency for mlx5e, from Arnd Bergmann.

 5) Allow neighbour updates to converge more quickly via gratuitous
    ARPs, from Ihar Hrachyshka.

 6) Fix compile error from CONFIG_INET is disabled, from Eric Dumazet.

 7) Fix use after free in x25 protocol init, from Lin Zhang.

 8) Valid VLAN pvid ranges passed into br_validate(), from Tobias
    Jungel.

 9) NULL out address lists in child sockets in SCTP, this is similar to
    the fix we made for inet connection sockets last week. From Eric
    Dumazet.

10) Fix NULL deref in mlxsw driver, from Ido Schimmel.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (27 commits)
  mlxsw: spectrum: Avoid possible NULL pointer dereference
  sh_eth: Do not print an error message for probe deferral
  sh_eth: Use platform device for printing before register_netdev()
  mlxsw: spectrum_router: Fix rif counter freeing routine
  mlxsw: spectrum_dpipe: Fix incorrect entry index
  cxgb4: update latest firmware version supported
  qmi_wwan: add another Lenovo EM74xx device ID
  sctp: do not inherit ipv6_{mc|ac|fl}_list from parent
  udp: make *udp*_queue_rcv_skb() functions static
  bridge: netlink: check vlan_default_pvid range
  net: ethernet: faraday: To support device tree usage.
  net: x25: fix one potential use-after-free issue
  bpf: adjust verifier heuristics
  ipv6: Check ip6_find_1stfragopt() return value properly.
  selftests/bpf: fix broken build due to types.h
  bnxt_en: Check status of firmware DCBX agent before setting DCB_CAP_DCBX_HOST.
  bnxt_en: Call bnxt_dcb_init() after getting firmware DCBX configuration.
  net: fix compile error in skb_orphan_partial()
  ipv6: Prevent overrun when parsing v6 header options
  neighbour: update neigh timestamps iff update is effective
  ...
parents a58a260f c0e01eac

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+1 −2
Original line number Diff line number Diff line
@@ -7630,8 +7630,6 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	dev->min_mtu = ETH_ZLEN;

	dev->max_mtu = BNXT_MAX_MTU;



	bnxt_dcb_init(bp);



#ifdef CONFIG_BNXT_SRIOV

	init_waitqueue_head(&bp->sriov_cfg_wait);

#endif
@@ -7669,6 +7667,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	bnxt_hwrm_func_qcfg(bp);

	bnxt_hwrm_port_led_qcaps(bp);

	bnxt_ethtool_init(bp);

	bnxt_dcb_init(bp);



	bnxt_set_rx_skb_mode(bp, false);

	bnxt_set_tpa_flags(bp);

drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c

+4 −2
Original line number Diff line number Diff line
@@ -553,8 +553,10 @@ static u8 bnxt_dcbnl_setdcbx(struct net_device *dev, u8 mode) 
	if ((mode & DCB_CAP_DCBX_VER_CEE) || !(mode & DCB_CAP_DCBX_VER_IEEE))

		return 1;



	if ((mode & DCB_CAP_DCBX_HOST) && BNXT_VF(bp))

	if (mode & DCB_CAP_DCBX_HOST) {

		if (BNXT_VF(bp) || (bp->flags & BNXT_FLAG_FW_LLDP_AGENT))

			return 1;

	}



	if (mode == bp->dcbx_cap)

		return 0;

drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 


#define T4FW_VERSION_MAJOR 0x01

#define T4FW_VERSION_MINOR 0x10

#define T4FW_VERSION_MICRO 0x21

#define T4FW_VERSION_MICRO 0x2B

#define T4FW_VERSION_BUILD 0x00



#define T4FW_MIN_VERSION_MAJOR 0x01
@@ -46,7 +46,7 @@ 


#define T5FW_VERSION_MAJOR 0x01

#define T5FW_VERSION_MINOR 0x10

#define T5FW_VERSION_MICRO 0x21

#define T5FW_VERSION_MICRO 0x2B

#define T5FW_VERSION_BUILD 0x00



#define T5FW_MIN_VERSION_MAJOR 0x00
@@ -55,7 +55,7 @@ 


#define T6FW_VERSION_MAJOR 0x01

#define T6FW_VERSION_MINOR 0x10

#define T6FW_VERSION_MICRO 0x21

#define T6FW_VERSION_MICRO 0x2B

#define T6FW_VERSION_BUILD 0x00



#define T6FW_MIN_VERSION_MAJOR 0x00

drivers/net/ethernet/faraday/ftmac100.c

+7 −0
Original line number Diff line number Diff line
@@ -1174,11 +1174,17 @@ static int ftmac100_remove(struct platform_device *pdev) 
	return 0;

}



static const struct of_device_id ftmac100_of_ids[] = {

	{ .compatible = "andestech,atmac100" },

	{ }

};



static struct platform_driver ftmac100_driver = {

	.probe		= ftmac100_probe,

	.remove		= ftmac100_remove,

	.driver		= {

		.name	= DRV_NAME,

		.of_match_table = ftmac100_of_ids

	},

};
@@ -1202,3 +1208,4 @@ module_exit(ftmac100_exit); 
MODULE_AUTHOR("Po-Yu Chuang <ratbert@faraday-tech.com>");

MODULE_DESCRIPTION("FTMAC100 driver");

MODULE_LICENSE("GPL");

MODULE_DEVICE_TABLE(of, ftmac100_of_ids);

drivers/net/ethernet/mellanox/mlx5/core/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ config MLX5_CORE 


config MLX5_CORE_EN

	bool "Mellanox Technologies ConnectX-4 Ethernet support"

	depends on NETDEVICES && ETHERNET && PCI && MLX5_CORE

	depends on NETDEVICES && ETHERNET && INET && PCI && MLX5_CORE

	depends on IPV6=y || IPV6=n || MLX5_CORE=m

	imply PTP_1588_CLOCK

	default n