@@ -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;
}
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(-)