Commit 3e8d3bdc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from David Miller:

 1) Use netif_rx_ni() when necessary in batman-adv stack, from Jussi
    Kivilinna.

 2) Fix loss of RTT samples in rxrpc, from David Howells.

 3) Memory leak in hns_nic_dev_probe(), from Dignhao Liu.

 4) ravb module cannot be unloaded, fix from Yuusuke Ashizuka.

 5) We disable BH for too lokng in sctp_get_port_local(), add a
    cond_resched() here as well, from Xin Long.

 6) Fix memory leak in st95hf_in_send_cmd, from Dinghao Liu.

 7) Out of bound access in bpf_raw_tp_link_fill_link_info(), from
    Yonghong Song.

 8) Missing of_node_put() in mt7530 DSA driver, from Sumera
    Priyadarsini.

 9) Fix crash in bnxt_fw_reset_task(), from Michael Chan.

10) Fix geneve tunnel checksumming bug in hns3, from Yi Li.

11) Memory leak in rxkad_verify_response, from Dinghao Liu.

12) In tipc, don't use smp_processor_id() in preemptible context. From
    Tuong Lien.

13) Fix signedness issue in mlx4 memory allocation, from Shung-Hsi Yu.

14) Missing clk_disable_prepare() in gemini driver, from Dan Carpenter.

15) Fix ABI mismatch between driver and firmware in nfp, from Louis
    Peens.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (110 commits)
  net/smc: fix sock refcounting in case of termination
  net/smc: reset sndbuf_desc if freed
  net/smc: set rx_off for SMCR explicitly
  net/smc: fix toleration of fake add_link messages
  tg3: Fix soft lockup when tg3_reset_task() fails.
  doc: net: dsa: Fix typo in config code sample
  net: dp83867: Fix WoL SecureOn password
  nfp: flower: fix ABI mismatch between driver and firmware
  tipc: fix shutdown() of connectionless socket
  ipv6: Fix sysctl max for fib_multipath_hash_policy
  drivers/net/wan/hdlc: Change the default of hard_header_len to 0
  net: gemini: Fix another missing clk_disable_unprepare() in probe
  net: bcmgenet: fix mask check in bcmgenet_validate_flow()
  amd-xgbe: Add support for new port mode
  net: usb: dm9601: Add USB ID of Keenetic Plus DSL
  vhost: fix typo in error message
  net: ethernet: mlx4: Fix memory allocation in mlx4_buddy_init()
  pktgen: fix error message with wrong function name
  net: ethernet: ti: am65-cpsw: fix rmii 100Mbit link mode
  cxgb4: fix thermal zone device registration
  ...
parents 8381979d b61ac5bb

Documentation/devicetree/bindings/net/dsa/dsa.txt

+1 −1
Original line number Diff line number Diff line 
Distributed Switch Architecture Device Tree Bindings

----------------------------------------------------



See Documentation/devicetree/bindings/net/dsa/dsa.yaml for the documenation.
 
See Documentation/devicetree/bindings/net/dsa/dsa.yaml for the documentation.

Documentation/networking/dsa/configuration.rst

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ The configuration can only be set up via VLAN tagging and bridge setup. 


  # bring up the slave interfaces

  ip link set lan1 up

  ip link set lan1 up

  ip link set lan2 up

  ip link set lan3 up



  # create bridge

MAINTAINERS

+16 −1
Original line number Diff line number Diff line
@@ -3389,6 +3389,7 @@ M: Florian Fainelli <f.fainelli@gmail.com> 
L:	netdev@vger.kernel.org

L:	openwrt-devel@lists.openwrt.org (subscribers-only)

S:	Supported

F:	Documentation/devicetree/bindings/net/dsa/b53.txt

F:	drivers/net/dsa/b53/*

F:	include/linux/platform_data/b53.h








@@ -3574,13 +3575,28 @@ L:	bcm-kernel-feedback-list@broadcom.com







S:	Maintained









F:	drivers/phy/broadcom/phy-brcm-usb*

















BROADCOM ETHERNET PHY DRIVERS









M:	Florian Fainelli <f.fainelli@gmail.com>









L:	bcm-kernel-feedback-list@broadcom.com









L:	netdev@vger.kernel.org









S:	Supported









F:	Documentation/devicetree/bindings/net/broadcom-bcm87xx.txt









F:	drivers/net/phy/bcm*.[ch]









F:	drivers/net/phy/broadcom.c









F:	include/linux/brcmphy.h

















BROADCOM GENET ETHERNET DRIVER









M:	Doug Berger <opendmb@gmail.com>









M:	Florian Fainelli <f.fainelli@gmail.com>









L:	bcm-kernel-feedback-list@broadcom.com









L:	netdev@vger.kernel.org









S:	Supported









F:	Documentation/devicetree/bindings/net/brcm,bcmgenet.txt









F:	Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt









F:	drivers/net/ethernet/broadcom/genet/









F:	drivers/net/mdio/mdio-bcm-unimac.c









F:	include/linux/platform_data/bcmgenet.h









F:	include/linux/platform_data/mdio-bcm-unimac.h

















BROADCOM IPROC ARM ARCHITECTURE









M:	Ray Jui <rjui@broadcom.com>








@@ -6496,7 +6512,6 @@ F:	net/bridge/















ETHERNET PHY LIBRARY









M:	Andrew Lunn <andrew@lunn.ch>









M:	Florian Fainelli <f.fainelli@gmail.com>









M:	Heiner Kallweit <hkallweit1@gmail.com>









R:	Russell King <linux@armlinux.org.uk>









L:	netdev@vger.kernel.org
































drivers/atm/firestream.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -998,6 +998,7 @@ static int fs_open(struct atm_vcc *atm_vcc)







				error = make_rate (pcr, r, &tmc0, NULL);









				if (error) {









					kfree(tc);









					kfree(vcc);









					return error;









				}









			}
































drivers/net/dsa/mt7530.c



+5
−2






























Original line number
Diff line number
Diff line







@@ -1326,14 +1326,17 @@ mt7530_setup(struct dsa_switch *ds)

















			if (phy_node->parent == priv->dev->of_node->parent) {









				ret = of_get_phy_mode(mac_np, &interface);









				if (ret && ret != -ENODEV)









				if (ret && ret != -ENODEV) {









					of_node_put(mac_np);









					return ret;









				}









				id = of_mdio_parse_addr(ds->dev, phy_node);









				if (id == 0)









					priv->p5_intf_sel = P5_INTF_SEL_PHY_P0;









				if (id == 4)









					priv->p5_intf_sel = P5_INTF_SEL_PHY_P4;









			}









			of_node_put(mac_np);









			of_node_put(phy_node);









			break;









		}








@@ -1501,7 +1504,7 @@ unsupported:







		phylink_set(mask, 100baseT_Full);



















		if (state->interface != PHY_INTERFACE_MODE_MII) {









			phylink_set(mask, 1000baseT_Half);









			/* This switch only supports 1G full-duplex. */









			phylink_set(mask, 1000baseT_Full);









			if (port == 5)









				phylink_set(mask, 1000baseX_Full);








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE