Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (479a72c0) · Commits · 戴 / test

Pull networking fixes from David Miller: 1) Slave bond and team devices should not be assigned ipv6 link local addresses, from Jarod Wilson. 2) Fix clock sink config on some at803x PHY devices, from Oleksij Rempel. 3) Uninitialized stack space transmitted in slcan frames, fix from Richard Palethorpe. 4) Guard HW VLAN ops properly in stmmac driver, from Jose Abreu. 5) "=" --> "|=" fix in aquantia driver, from Colin Ian King. 6) Fix TCP fallback in mptcp, from Florian Westphal. (accessing a plain tcp_sk as if it were an mptcp socket). 7) Fix cavium driver in some configurations wrt. PTP, from Yue Haibing. 8) Make ipv6 and ipv4 consistent in the lower bound allowed for neighbour entry retrans_time, from Hangbin Liu. 9) Don't use private workqueue in pegasus usb driver, from Petko Manolov. 10) Fix integer overflow in mlxsw, from Colin Ian King. 11) Missing refcnt init in cls_tcindex, from Cong Wang. 12) One too many loop iterations when processing cmpri entries in ipv6 rpl code, from Alexander Aring. 13) Disable SG and TSO by default in r8169, from Heiner Kallweit. 14) NULL deref in macsec, from Davide Caratti. * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (42 commits) macsec: fix NULL dereference in macsec_upd_offload() skbuff.h: Improve the checksum related comments net: dsa: bcm_sf2: Ensure correct sub-node is parsed qed: remove redundant assignment to variable 'rc' wimax: remove some redundant assignments to variable result mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_VLAN_MANGLE mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_PRIORITY r8169: change back SG and TSO to be disabled by default net: dsa: bcm_sf2: Do not register slave MDIO bus with OF ipv6: rpl: fix loop iteration tun: Don't put_page() for all negative return values from XDP program net: dsa: mt7530: fix null pointer dereferencing in port5 setup mptcp: add some missing pr_fmt defines net: phy: micrel: kszphy_resume(): add delay after genphy_resume() before accessing PHY registers net_sched: fix a missing refcnt in tcindex_init() net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting mlxsw: spectrum_trap: fix unintention integer overflow on left shift pegasus: Remove pegasus' own workqueue neigh: support smaller retrans_time settting net: openvswitch: use hlist_for_each_entry_rcu instead of hlist_for_each_entry ...

Documentation/devicetree/bindings/net/marvell,mvusb.yaml

+14 −15

Original line number	Diff line number	Diff line
		@@ -38,20 +38,18 @@ required:
		examples:
		- \|
		/* USB host controller */
		&usb1 {
		mvusb: mdio@1 {
		usb {
		#address-cells = <1>;
		#size-cells = <0>;

		mdio@1 {
		compatible = "usb1286,1fa4";
		reg = <1>;
		#address-cells = <1>;
		#size-cells = <0>;
		};
		};

		/* MV88E6390X devboard */
		&mvusb {
		switch@0 {
		compatible = "marvell,mv88e6190";
		status = "ok";
		reg = <0x0>;

		ports {
		@@ -63,3 +61,4 @@ examples:
		};
		};
		};
		};

drivers/crypto/chelsio/chcr_ktls.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		/* Copyright (C) 2020 Chelsio Communications. All rights reserved. */

		#ifdef CONFIG_CHELSIO_TLS_DEVICE
		#include <linux/highmem.h>
		#include "chcr_ktls.h"
		#include "clip_tbl.h"

drivers/net/can/slcan.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -148,7 +148,7 @@ static void slc_bump(struct slcan *sl)
		u32 tmpid;
		char *cmd = sl->rbuff;

		cf.can_id = 0;
		memset(&cf, 0, sizeof(cf));

		switch (*cmd) {
		case 'r':
		@@ -187,8 +187,6 @@ static void slc_bump(struct slcan *sl)
		else
		return;

		(u64 ) (&cf.data) = 0; /* clear payload */

		/* RTR frames may have a dlc > 0 but they never have any data bytes */
		if (!(cf.can_id & CAN_RTR_FLAG)) {
		for (i = 0; i < cf.can_dlc; i++) {

drivers/net/dsa/bcm_sf2.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -480,7 +480,7 @@ static int bcm_sf2_mdio_register(struct dsa_switch *ds)
		priv->slave_mii_bus->parent = ds->dev->parent;
		priv->slave_mii_bus->phy_mask = ~priv->indir_phy_mask;

		err = of_mdiobus_register(priv->slave_mii_bus, dn);
		err = mdiobus_register(priv->slave_mii_bus);
		if (err && dn)
		of_node_put(dn);

		@@ -1079,6 +1079,7 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)
		const struct bcm_sf2_of_data *data;
		struct b53_platform_data *pdata;
		struct dsa_switch_ops *ops;
		struct device_node *ports;
		struct bcm_sf2_priv *priv;
		struct b53_device *dev;
		struct dsa_switch *ds;
		@@ -1146,7 +1147,11 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)
		set_bit(0, priv->cfp.used);
		set_bit(0, priv->cfp.unique);

		bcm_sf2_identify_ports(priv, dn->child);
		ports = of_find_node_by_name(dn, "ports");
		if (ports) {
		bcm_sf2_identify_ports(priv, ports);
		of_node_put(ports);
		}

		priv->irq0 = irq_of_parse_and_map(dn, 0);
		priv->irq1 = irq_of_parse_and_map(dn, 1);

drivers/net/dsa/mt7530.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1403,6 +1403,9 @@ mt7530_setup(struct dsa_switch *ds)
		continue;

		phy_node = of_parse_phandle(mac_np, "phy-handle", 0);
		if (!phy_node)
		continue;

		if (phy_node->parent == priv->dev->of_node->parent) {
		ret = of_get_phy_mode(mac_np, &interface);
		if (ret && ret != -ENODEV)

Admin message