From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 3 Mar 2022 19:55:12 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=80901bff812984624918d9d03f9286e3245ee9a5;p=linux.git

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

net/batman-adv/hard-interface.c
  commit 690bb6fb64f5 ("batman-adv: Request iflink once in batadv-on-batadv check")
  commit 6ee3c393eeb7 ("batman-adv: Demote batadv-on-batadv skip error message")
https://lore.kernel.org/all/20220302163049.101957-1-sw@simonwunderlich.de/

net/smc/af_smc.c
  commit 4d08b7b57ece ("net/smc: Fix cleanup when register ULP fails")
  commit 462791bbfa35 ("net/smc: add sysctl interface for SMC")
https://lore.kernel.org/all/20220302112209.355def40@canb.auug.org.au/

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

80901bff812984624918d9d03f9286e3245ee9a5
diff --cc net/batman-adv/hard-interface.c
index b25afc7ff59cf,35fadb9248498..83fb51b6e2994
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@@ -162,12 -162,15 +162,15 @@@ static bool batadv_is_on_batman_iface(c
  
  	parent_net = batadv_getlink_net(net_dev, net);
  
+ 	/* iflink to itself, most likely physical device */
+ 	if (net == parent_net && iflink == net_dev->ifindex)
+ 		return false;
+ 
  	/* recurse over the parent device */
- 	parent_dev = __dev_get_by_index((struct net *)parent_net,
- 					dev_get_iflink(net_dev));
+ 	parent_dev = __dev_get_by_index((struct net *)parent_net, iflink);
 -	/* if we got a NULL parent_dev there is something broken.. */
  	if (!parent_dev) {
 -		pr_err("Cannot find parent device\n");
 +		pr_warn("Cannot find parent device. Skipping batadv-on-batadv check for %s\n",
 +			net_dev->name);
  		return false;
  	}
  
diff --cc net/smc/af_smc.c
index 6447607675fa9,284befa909676..e508e4f3a0737
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@@ -3287,20 -3087,14 +3293,22 @@@ static int __init smc_init(void
  	rc = tcp_register_ulp(&smc_ulp_ops);
  	if (rc) {
  		pr_err("%s: tcp_ulp_register fails with %d\n", __func__, rc);
- 		goto out_sock;
+ 		goto out_ib;
  	}
  
 +	rc = smc_sysctl_init();
 +	if (rc) {
 +		pr_err("%s: sysctl_init fails with %d\n", __func__, rc);
 +		goto out_ulp;
 +	}
 +
  	static_branch_enable(&tcp_have_smc);
  	return 0;
  
 +out_ulp:
 +	tcp_unregister_ulp(&smc_ulp_ops);
+ out_ib:
+ 	smc_ib_unregister_client();
  out_sock:
  	sock_unregister(PF_SMC);
  out_proto6: