linux-wpan.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Alexander Aring <alex.aring@gmail.com>,
	Stefan Schmidt <stefan@datenfreihafen.org>,
	linux-wpan@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>,
	netdev@vger.kernel.org, Xue Liu <liuxuenetmail@gmail.com>,
	Marcel Holtmann <marcel@holtmann.org>,
	Harry Morris <harrymorris12@gmail.com>,
	David Girault <david.girault@qorvo.com>,
	Romuald Despres <romuald.despres@qorvo.com>,
	Frederic Blain <frederic.blain@qorvo.com>,
	Nicolas Schodet <nico@ni.fr.eu.org>,
	Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
	Miquel Raynal <miquel.raynal@bootlin.com>
Subject: [wpan-next v2 1/9] net: ieee802154: hwsim: Ensure proper channel selection at probe time
Date: Thu, 20 Jan 2022 12:21:07 +0100	[thread overview]
Message-ID: <20220120112115.448077-2-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20220120112115.448077-1-miquel.raynal@bootlin.com>

Drivers are expected to set the PHY current_channel and current_page
according to their default state. The hwsim driver is advertising being
configured on channel 13 by default but that is not reflected in its own
internal pib structure. In order to ensure that this driver consider the
current channel as being 13 internally, we can call hwsim_hw_channel()
instead of creating an empty pib structure.

We assume here that kvfree_rcu(NULL) is a valid call.

Fixes: f25da51fdc38 ("ieee802154: hwsim: add replacement for fakelb")
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
 drivers/net/ieee802154/mac802154_hwsim.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/net/ieee802154/mac802154_hwsim.c b/drivers/net/ieee802154/mac802154_hwsim.c
index 8caa61ec718f..795f8eb5387b 100644
--- a/drivers/net/ieee802154/mac802154_hwsim.c
+++ b/drivers/net/ieee802154/mac802154_hwsim.c
@@ -732,7 +732,6 @@ static int hwsim_add_one(struct genl_info *info, struct device *dev,
 {
 	struct ieee802154_hw *hw;
 	struct hwsim_phy *phy;
-	struct hwsim_pib *pib;
 	int idx;
 	int err;
 
@@ -780,13 +779,8 @@ static int hwsim_add_one(struct genl_info *info, struct device *dev,
 
 	/* hwsim phy channel 13 as default */
 	hw->phy->current_channel = 13;
-	pib = kzalloc(sizeof(*pib), GFP_KERNEL);
-	if (!pib) {
-		err = -ENOMEM;
-		goto err_pib;
-	}
+	hwsim_hw_channel(hw, hw->phy->current_page, hw->phy->current_channel);
 
-	rcu_assign_pointer(phy->pib, pib);
 	phy->idx = idx;
 	INIT_LIST_HEAD(&phy->edges);
 
@@ -815,8 +809,6 @@ static int hwsim_add_one(struct genl_info *info, struct device *dev,
 err_subscribe:
 	ieee802154_unregister_hw(phy->hw);
 err_reg:
-	kfree(pib);
-err_pib:
 	ieee802154_free_hw(phy->hw);
 	return err;
 }
-- 
2.27.0


  reply	other threads:[~2022-01-20 11:21 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-20 11:21 [wpan-next v2 0/9] ieee802154: A bunch of fixes Miquel Raynal
2022-01-20 11:21 ` Miquel Raynal [this message]
2022-01-23 20:34   ` [wpan-next v2 1/9] net: ieee802154: hwsim: Ensure proper channel selection at probe time Alexander Aring
2022-01-25 10:40     ` Miquel Raynal
2022-01-20 11:21 ` [wpan-next v2 2/9] net: ieee802154: hwsim: Ensure frame checksum are valid Miquel Raynal
2022-01-20 11:21 ` [wpan-next v2 3/9] net: ieee802154: mcr20a: Fix lifs/sifs periods Miquel Raynal
2022-01-21 16:01   ` Stefan Schmidt
2022-01-20 11:21 ` [wpan-next v2 4/9] net: ieee802154: at86rf230: Stop leaking skb's Miquel Raynal
2022-01-23 20:43   ` Alexander Aring
2022-01-23 20:59     ` Alexander Aring
2022-01-23 22:41     ` Alexander Aring
2022-01-23 23:14       ` Alexander Aring
2022-01-25 10:58         ` Miquel Raynal
2022-01-20 11:21 ` [wpan-next v2 5/9] net: ieee802154: ca8210: " Miquel Raynal
2022-01-23 21:00   ` Alexander Aring
2022-01-20 11:21 ` [wpan-next v2 6/9] net: ieee802154: Use the IEEE802154_MAX_PAGE define when relevant Miquel Raynal
2022-01-21 16:00   ` Stefan Schmidt
2022-01-23 20:44   ` Alexander Aring
2022-01-24  8:06     ` Stefan Schmidt
2022-01-25 11:10       ` Miquel Raynal
2022-01-20 11:21 ` [wpan-next v2 7/9] net: ieee802154: Return meaningful error codes from the netlink helpers Miquel Raynal
2022-01-20 11:21 ` [wpan-next v2 8/9] net: mac802154: Explain the use of ieee802154_wake/stop_queue() Miquel Raynal
2022-01-23 20:56   ` Alexander Aring
2022-01-25 11:32     ` Miquel Raynal
2022-01-20 11:21 ` [wpan-next v2 9/9] MAINTAINERS: Remove Harry Morris bouncing address Miquel Raynal
2022-01-20 22:52 ` [wpan-next v2 0/9] ieee802154: A bunch of fixes Alexander Aring
2022-01-20 23:07   ` Alexander Aring
2022-01-21  8:27   ` Miquel Raynal
2022-01-21 12:48     ` Stefan Schmidt
2022-01-25  9:51       ` Miquel Raynal
2022-01-21 16:09 ` Stefan Schmidt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220120112115.448077-2-miquel.raynal@bootlin.com \
    --to=miquel.raynal@bootlin.com \
    --cc=alex.aring@gmail.com \
    --cc=davem@davemloft.net \
    --cc=david.girault@qorvo.com \
    --cc=frederic.blain@qorvo.com \
    --cc=harrymorris12@gmail.com \
    --cc=kuba@kernel.org \
    --cc=linux-wpan@vger.kernel.org \
    --cc=liuxuenetmail@gmail.com \
    --cc=marcel@holtmann.org \
    --cc=netdev@vger.kernel.org \
    --cc=nico@ni.fr.eu.org \
    --cc=romuald.despres@qorvo.com \
    --cc=stefan@datenfreihafen.org \
    --cc=thomas.petazzoni@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).