From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 5 May 2022 20:03:18 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c8227d568ddf2f38a8806fdcd2e20b9e11747d9a;p=linux.git

Merge git://git./linux/kernel/git/netdev/net

tools/testing/selftests/net/forwarding/Makefile
  f62c5acc800e ("selftests/net/forwarding: add missing tests to Makefile")
  50fe062c806e ("selftests: forwarding: new test, verify host mdb entries")
https://lore.kernel.org/all/20220502111539.0b7e4621@canb.auug.org.au/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

c8227d568ddf2f38a8806fdcd2e20b9e11747d9a
diff --cc drivers/net/ethernet/xilinx/xilinx_emaclite.c
index 7a86ae82fcc1f,d770b3ac3f74f..016a9c4f2c6c7
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@@ -816,11 -836,16 +816,17 @@@ static int xemaclite_mdio_setup(struct 
  		return -ENODEV;
  	}
  	npp = of_get_parent(np);
- 
- 	of_address_to_resource(npp, 0, &res);
+ 	ret = of_address_to_resource(npp, 0, &res);
+ 	of_node_put(npp);
+ 	if (ret) {
+ 		dev_err(dev, "%s resource error!\n",
+ 			dev->of_node->full_name);
+ 		of_node_put(np);
+ 		return ret;
+ 	}
  	if (lp->ndev->mem_start != res.start) {
  		struct phy_device *phydev;
 +
  		phydev = of_phy_find_device(lp->phy_node);
  		if (!phydev)
  			dev_info(dev,
diff --cc net/nfc/core.c
index 67524982b89b2,5b286e1e0a6ff..6ff3e10ff8e35
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@@ -1165,8 -1166,8 +1166,9 @@@ void nfc_unregister_device(struct nfc_d
  	if (dev->rfkill) {
  		rfkill_unregister(dev->rfkill);
  		rfkill_destroy(dev->rfkill);
 +		dev->rfkill = NULL;
  	}
+ 	dev->shutting_down = true;
  	device_unlock(&dev->dev);
  
  	if (dev->ops->check_presence) {
diff --cc tools/testing/selftests/net/forwarding/Makefile
index ae80c2aef5775,c87e674b61b1d..0912f5ae7f6be
--- a/tools/testing/selftests/net/forwarding/Makefile
+++ b/tools/testing/selftests/net/forwarding/Makefile
@@@ -2,7 -2,7 +2,8 @@@
  
  TEST_PROGS = bridge_igmp.sh \
  	bridge_locked_port.sh \
 +	bridge_mdb.sh \
+ 	bridge_mld.sh \
  	bridge_port_isolation.sh \
  	bridge_sticky_fdb.sh \
  	bridge_vlan_aware.sh \