* [PATCH 1/2] wireless: expose set-wiphy-name method to other modules.
@ 2014-09-25 23:59 greearb
2014-09-25 23:59 ` [PATCH 2/2] mac-sim: support creating radios with specific name greearb
2014-09-26 21:32 ` [PATCH 1/2] wireless: expose set-wiphy-name method to other modules Ben Greear
0 siblings, 2 replies; 3+ messages in thread
From: greearb @ 2014-09-25 23:59 UTC (permalink / raw)
To: linux-wireless; +Cc: Ben Greear
From: Ben Greear <greearb@candelatech.com>
This will let hw-sim create wiphy objects with a specific
name.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
include/net/cfg80211.h | 6 ++++++
net/wireless/core.c | 9 +++++++++
2 files changed, 15 insertions(+)
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 3a13aab..68aabfa 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
@@ -4869,6 +4874,7 @@ void cfg80211_stop_iface(struct wiphy *wiphy, struct wireless_dev *wdev,
void cfg80211_shutdown_all_interfaces(struct wiphy *wiphy);
+
/* ethtool helper */
void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info);
diff --git a/net/wireless/core.c b/net/wireless/core.c
index f52a4cd..03e4715 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)
{
--
1.7.11.7
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] mac-sim: support creating radios with specific name.
2014-09-25 23:59 [PATCH 1/2] wireless: expose set-wiphy-name method to other modules greearb
@ 2014-09-25 23:59 ` greearb
2014-09-26 21:32 ` [PATCH 1/2] wireless: expose set-wiphy-name method to other modules Ben Greear
1 sibling, 0 replies; 3+ messages in thread
From: greearb @ 2014-09-25 23:59 UTC (permalink / raw)
To: linux-wireless; +Cc: Ben Greear
From: Ben Greear <greearb@candelatech.com>
Otherwise, it can be very difficult to know which is which
if you are trying to do detailed testing.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
NOTE: This depends on the earlier patch that added the radio-name
attribute.
drivers/net/wireless/mac80211_hwsim.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index b755920..2b54413 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -2018,7 +2018,7 @@ static struct ieee80211_ops mac80211_hwsim_mchan_ops;
static int mac80211_hwsim_create_radio(int channels, const char *reg_alpha2,
const struct ieee80211_regdomain *regd,
bool reg_strict, bool p2p_device,
- bool use_chanctx)
+ bool use_chanctx, char* hwname)
{
int err;
u8 addr[ETH_ALEN];
@@ -2230,6 +2230,12 @@ static int mac80211_hwsim_create_radio(int channels, const char *reg_alpha2,
goto failed_hw;
}
+ if (hwname)
+ /* If this fails, continue on anyway, treat it as request
+ * instead of command.
+ */
+ cfg80211_dev_rename_wiphy(hw->wiphy, hwname);
+
wiphy_debug(hw->wiphy, "hwaddr %pM registered\n", hw->wiphy->perm_addr);
if (reg_alpha2)
@@ -2508,10 +2514,14 @@ static int hwsim_create_radio_nl(struct sk_buff *msg, struct genl_info *info)
bool reg_strict = info->attrs[HWSIM_ATTR_REG_STRICT_REG];
bool p2p_device = info->attrs[HWSIM_ATTR_SUPPORT_P2P_DEVICE];
bool use_chanctx;
+ char* hwname = NULL;
if (info->attrs[HWSIM_ATTR_CHANNELS])
chans = nla_get_u32(info->attrs[HWSIM_ATTR_CHANNELS]);
+ if (info->attrs[HWSIM_ATTR_RADIO_NAME])
+ hwname = nla_data(info->attrs[HWSIM_ATTR_RADIO_NAME]);
+
if (info->attrs[HWSIM_ATTR_USE_CHANCTX])
use_chanctx = true;
else
@@ -2529,7 +2539,7 @@ static int hwsim_create_radio_nl(struct sk_buff *msg, struct genl_info *info)
}
return mac80211_hwsim_create_radio(chans, alpha2, regd, reg_strict,
- p2p_device, use_chanctx);
+ p2p_device, use_chanctx, hwname);
}
static int hwsim_destroy_radio_nl(struct sk_buff *msg, struct genl_info *info)
@@ -2761,7 +2771,7 @@ static int __init init_mac80211_hwsim(void)
err = mac80211_hwsim_create_radio(channels, reg_alpha2,
regd, reg_strict,
support_p2p_device,
- channels > 1);
+ channels > 1, NULL);
if (err < 0)
goto out_free_radios;
}
--
1.7.11.7
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] wireless: expose set-wiphy-name method to other modules.
2014-09-25 23:59 [PATCH 1/2] wireless: expose set-wiphy-name method to other modules greearb
2014-09-25 23:59 ` [PATCH 2/2] mac-sim: support creating radios with specific name greearb
@ 2014-09-26 21:32 ` Ben Greear
1 sibling, 0 replies; 3+ messages in thread
From: Ben Greear @ 2014-09-26 21:32 UTC (permalink / raw)
To: linux-wireless
On 09/25/2014 04:59 PM, greearb@candelatech.com wrote:
> From: Ben Greear <greearb@candelatech.com>
>
> This will let hw-sim create wiphy objects with a specific
> name.
This has an added whitespace that should not have been included,
and next patch does not take rtnl before doing the rename.
Will test some more and re-send.
Thanks,
Ben
--
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-26 21:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-25 23:59 [PATCH 1/2] wireless: expose set-wiphy-name method to other modules greearb
2014-09-25 23:59 ` [PATCH 2/2] mac-sim: support creating radios with specific name greearb
2014-09-26 21:32 ` [PATCH 1/2] wireless: expose set-wiphy-name method to other modules Ben Greear
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).