[v2,1/4] wireless: expose set-wiphy-name method to other modules.

Commit Message

Ben Greear Sept. 26, 2014, 11:24 p.m. UTC

From: Ben Greear <[e-mail]>

This will let hw-sim create wiphy objects with a specific
name.

Signed-off-by: Ben Greear <[e-mail]>
---

v2:  Fix checkpatch warnings (char * instead of char*)

 include/net/cfg80211.h | 5 +++++
 net/wireless/core.c    | 9 +++++++++
 2 files changed, 14 insertions(+)

Comments

Johannes Berg Oct. 6, 2014, 2:27 p.m. UTC | #1

On Fri, 2014-09-26 at 16:24 -0700, [e-mail] wrote:

> +/*
> + * Attempt to rename a device.  Acquire RTNL before calling.
> + */

please add kernel-doc

> +int cfg80211_dev_rename_wiphy(struct wiphy *wiphy, char *newname);

Should also be const char *

And should probably be called cfg80211_rename_wiphy() only? What's the
dev doing there?
>  
> +int cfg80211_dev_rename_wiphy(struct wiphy *wiphy, char *newname)
> +{
> +	struct cfg80211_registered_device *rdev;
> +
> +	rdev = wiphy_to_rdev(wiphy);
> +	return cfg80211_dev_rename(rdev, newname);

You could just inlin ethe wiphy_to_rdev() and get rid of the variable.

Anyhow - if the intent is to do this at creation, why do you do it after
the fact? Couldn't you just specify the name when creating it?

johannes

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Ben Greear Oct. 6, 2014, 6:26 p.m. UTC | #2

On 10/06/2014 07:27 AM, Johannes Berg wrote:
> On Fri, 2014-09-26 at 16:24 -0700, [e-mail] wrote:
>
>> +/*
>> + * Attempt to rename a device.  Acquire RTNL before calling.
>> + */
>
> please add kernel-doc
>
>> +int cfg80211_dev_rename_wiphy(struct wiphy *wiphy, char *newname);
>
> Should also be const char *
>
> And should probably be called cfg80211_rename_wiphy() only? What's the
> dev doing there?
>>
>> +int cfg80211_dev_rename_wiphy(struct wiphy *wiphy, char *newname)
>> +{
>> +	struct cfg80211_registered_device *rdev;
>> +
>> +	rdev = wiphy_to_rdev(wiphy);
>> +	return cfg80211_dev_rename(rdev, newname);
>
> You could just inlin ethe wiphy_to_rdev() and get rid of the variable.
>
> Anyhow - if the intent is to do this at creation, why do you do it after
> the fact? Couldn't you just specify the name when creating it?

That would be fine with me..I thought it might be more invasive
and thus less welcome.  I'll see what it takes to implement it
like that when I get a chance.  On the road this week, so might
be a bit...

Thanks,
Ben

>
> johannes
>

Patch

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 3a13aab..e1641e6 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -4854,6 +4854,11 @@  int cfg80211_iter_combinations(struct wiphy *wiphy,
 void cfg80211_stop_iface(struct wiphy *wiphy, struct wireless_dev *wdev,
 			 gfp_t gfp);
 
+/*
+ * Attempt to rename a device.  Acquire RTNL before calling.
+ */
+int cfg80211_dev_rename_wiphy(struct wiphy *wiphy, char *newname);
+
 /**
  * cfg80211_shutdown_all_interfaces - shut down all interfaces for a wiphy
  * @wiphy: the wiphy to shut down
diff --git a/net/wireless/core.c b/net/wireless/core.c
index f52a4cd..4d7e17c 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -86,6 +86,15 @@  struct wiphy *wiphy_idx_to_wiphy(int wiphy_idx)
 	return &rdev->wiphy;
 }
 
+int cfg80211_dev_rename_wiphy(struct wiphy *wiphy, char *newname)
+{
+	struct cfg80211_registered_device *rdev;
+
+	rdev = wiphy_to_rdev(wiphy);
+	return cfg80211_dev_rename(rdev, newname);
+}
+EXPORT_SYMBOL_GPL(cfg80211_dev_rename_wiphy);
+
 int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
 			char *newname)
 {