Received-SPF: pass (google.com: domain of linux-wireless+bounces-8386-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Mon, 3 Jun 2024 11:01:12 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kalle Valo <kvalo@kernel.org>, Johannes Berg
 <johannes@sipsolutions.net>, Wireless <linux-wireless@vger.kernel.org>
Cc: Alexis =?UTF-8?B?TG90aG9yw6k=?= <alexis.lothore@bootlin.com>, Linux
 Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the wireless-next tree with the
 wireless tree
Message-ID: <20240603110023.23572803@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/05OeU/QARN9V22btBlEw4aP";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/05OeU/QARN9V22btBlEw4aP
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the wireless-next tree got a conflict in:

  drivers/net/wireless/microchip/wilc1000/netdev.c

between commit:

  ebfb5e8fc8b4 ("Revert "wifi: wilc1000: convert list management to RCU"")

from the wireless tree and commit:

  6fe46d5c0a84 ("wifi: wilc1000: set net device registration as last step d=
uring interface creation")

from the wireless-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/net/wireless/microchip/wilc1000/netdev.c
index 710e29bea560,4e2698528a49..000000000000
--- a/drivers/net/wireless/microchip/wilc1000/netdev.c
+++ b/drivers/net/wireless/microchip/wilc1000/netdev.c
@@@ -679,9 -669,9 +672,9 @@@ static int wilc_set_mac_addr(struct net
  			return 0;
  		}
  	}
 -	rcu_read_unlock();
 +	srcu_read_unlock(&wilc->srcu, srcu_idx);
 =20
- 	result =3D wilc_set_mac_address(vif, (u8 *)addr->sa_data);
+ 	result =3D wilc_set_mac_address(vif, addr->sa_data);
  	if (result)
  		return result;
 =20
@@@ -972,6 -959,28 +966,28 @@@ struct wilc_vif *wilc_netdev_ifc_init(s
  	vif->priv.wdev.iftype =3D type;
  	vif->priv.dev =3D ndev;
 =20
+ 	ndev->needs_free_netdev =3D true;
+ 	vif->iftype =3D vif_type;
+ 	vif->idx =3D wilc_get_available_idx(wl);
+ 	vif->mac_opened =3D 0;
+=20
+ 	memcpy(mac_address, wl->nv_mac_address, ETH_ALEN);
+ 	/* WILC firmware uses locally administered MAC address for the
+ 	 * second virtual interface (bit 1 of first byte set), but
+ 	 * since it is possibly not loaded/running yet, reproduce this behavior
+ 	 * in the driver during interface creation.
+ 	 */
+ 	if (vif->idx)
+ 		mac_address[0] |=3D 0x2;
+=20
+ 	eth_hw_addr_set(vif->ndev, mac_address);
+=20
+ 	mutex_lock(&wl->vif_mutex);
+ 	list_add_tail_rcu(&vif->list, &wl->vif_list);
+ 	wl->vif_num +=3D 1;
+ 	mutex_unlock(&wl->vif_mutex);
 -	synchronize_rcu();
++	synchronize_srcu(&wl->srcu);
+=20
  	if (rtnl_locked)
  		ret =3D cfg80211_register_netdevice(ndev);
  	else
@@@ -979,26 -988,17 +995,17 @@@
 =20
  	if (ret) {
  		ret =3D -EFAULT;
- 		goto error;
+ 		goto error_remove_vif;
  	}
 =20
- 	ndev->needs_free_netdev =3D true;
- 	vif->iftype =3D vif_type;
- 	vif->idx =3D wilc_get_available_idx(wl);
- 	vif->mac_opened =3D 0;
- 	mutex_lock(&wl->vif_mutex);
- 	list_add_tail_rcu(&vif->list, &wl->vif_list);
- 	wl->vif_num +=3D 1;
- 	mutex_unlock(&wl->vif_mutex);
- 	synchronize_srcu(&wl->srcu);
-=20
  	return vif;
 =20
- error:
- 	if (rtnl_locked)
- 		cfg80211_unregister_netdevice(ndev);
- 	else
- 		unregister_netdev(ndev);
+ error_remove_vif:
+ 	mutex_lock(&wl->vif_mutex);
+ 	list_del_rcu(&vif->list);
+ 	wl->vif_num -=3D 1;
+ 	mutex_unlock(&wl->vif_mutex);
 -	synchronize_rcu();
++	synchronize_srcu(&wl->srcu);
  	free_netdev(ndev);
  	return ERR_PTR(ret);
  }

--Sig_/05OeU/QARN9V22btBlEw4aP
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZdFdgACgkQAVBC80lX
0Gwkfwf/drOmN75fgWcpn3xrxdrqng1PyF0wr1Vp4nKqgNlxKXEmK6jSqh5yDeN+
6A7OggoDlsGfYAakLCEghJ40a8LIVqEM8oLISXbRVRHi2kHQXt89WLCds3qbcuzS
dBY2gJWhwuMkGAnQWQ6PXr90atAYI7zZ07zunOX+cHYbYBMr2358SUX+ZaMGWRok
w3ZQ6ZiJQv3UtYVn3vWi6wsm2jmTIFFDwqF8L2ky0hMsj7/Rv8a4zt2/ebbWOvuB
BynFvvXX/TYpeluaQ5XEg+1QVO0LnYMmkbzkpiNCyM0iUu45sUUEG+lukgeBjW2a
3an4E0V8z9vgBG02IYFkk4iXlurb/Q==
=hvcf
-----END PGP SIGNATURE-----

--Sig_/05OeU/QARN9V22btBlEw4aP--