2012-04-03 14:40:07

by Pontus Fuchs

Subject: [PATCH] cfg80211: Add channel information to NL80211_CMD_GET_INTERFACE

If the current channel is known, add frequency and channel type to
NL80211_CMD_GET_INTERFACE.

Signed-off-by: Pontus Fuchs <[email protected]>
---
include/net/cfg80211.h | 3 ++-
net/mac80211/cfg.c | 4 +++-
net/wireless/nl80211.c | 13 +++++++++++++
net/wireless/wext-compat.c | 3 ++-
4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 83d800c..a1b202c 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1698,7 +1698,8 @@ struct cfg80211_ops {
struct net_device *dev,
u16 noack_map);

- struct ieee80211_channel *(*get_channel)(struct wiphy *wiphy);
+ struct ieee80211_channel *(*get_channel)(struct wiphy *wiphy,
+ enum nl80211_channel_type *type);
};

/*
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 677d659..dff41f4 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -2666,10 +2666,12 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev,
}

static struct ieee80211_channel *
-ieee80211_wiphy_get_channel(struct wiphy *wiphy)
+ieee80211_wiphy_get_channel(struct wiphy *wiphy,
+ enum nl80211_channel_type *type)
{
struct ieee80211_local *local = wiphy_priv(wiphy);

+ *type = local->_oper_channel_type;
return local->oper_channel;
}

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index e49da27..66c4d27 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1493,6 +1493,19 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 pid, u32 seq, int flags,
rdev->devlist_generation ^
(cfg80211_rdev_list_generation << 2));

+ if (rdev->ops->get_channel) {
+ struct ieee80211_channel *chan;
+ enum nl80211_channel_type channel_type;
+
+ chan = rdev->ops->get_channel(&rdev->wiphy, &channel_type);
+ if (chan) {
+ NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ,
+ chan->center_freq);
+ NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
+ channel_type);
+ }
+ }
+
return genlmsg_end(msg, hdr);

nla_put_failure:
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 3c24eb9..6a6181a 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -821,6 +821,7 @@ static int cfg80211_wext_giwfreq(struct net_device *dev,
struct wireless_dev *wdev = dev->ieee80211_ptr;
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
struct ieee80211_channel *chan;
+ enum nl80211_channel_type channel_type;

switch (wdev->iftype) {
case NL80211_IFTYPE_STATION:
@@ -831,7 +832,7 @@ static int cfg80211_wext_giwfreq(struct net_device *dev,
if (!rdev->ops->get_channel)
return -EINVAL;

- chan = rdev->ops->get_channel(wdev->wiphy);
+ chan = rdev->ops->get_channel(wdev->wiphy, &channel_type);
if (!chan)
return -EINVAL;
freq->m = chan->center_freq;
--
1.7.5.4

2012-04-04 07:34:50

by Johannes Berg

Subject: Re: [PATCH] cfg80211: Add channel information to NL80211_CMD_GET_INTERFACE

On Tue, 2012-04-03 at 16:39 +0200, Pontus Fuchs wrote:
> If the current channel is known, add frequency and channel type to
> NL80211_CMD_GET_INTERFACE.
>
> Signed-off-by: Pontus Fuchs <[email protected]>
> ---
> include/net/cfg80211.h | 3 ++-
> net/mac80211/cfg.c | 4 +++-
> net/wireless/nl80211.c | 13 +++++++++++++
> net/wireless/wext-compat.c | 3 ++-
> 4 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
> index 83d800c..a1b202c 100644
> --- a/include/net/cfg80211.h
> +++ b/include/net/cfg80211.h
> @@ -1698,7 +1698,8 @@ struct cfg80211_ops {
> struct net_device *dev,
> u16 noack_map);
>
> - struct ieee80211_channel *(*get_channel)(struct wiphy *wiphy);
> + struct ieee80211_channel *(*get_channel)(struct wiphy *wiphy,
> + enum nl80211_channel_type *type);

If you're adding it to GET_INTERFACE, maybe you should also get it per
interface so we can do something smarter when we add multi-channel?

johannes

2012-04-04 08:45:11

by Pontus Fuchs

Subject: Re: [PATCH] cfg80211: Add channel information to NL80211_CMD_GET_INTERFACE

On 2012-04-04 09:34, Johannes Berg wrote:
> On Tue, 2012-04-03 at 16:39 +0200, Pontus Fuchs wrote:
>> If the current channel is known, add frequency and channel type to
>> NL80211_CMD_GET_INTERFACE.
>>
...

>> - struct ieee80211_channel *(*get_channel)(struct wiphy *wiphy);
>> + struct ieee80211_channel *(*get_channel)(struct wiphy *wiphy,
>> + enum nl80211_channel_type *type);
>
> If you're adding it to GET_INTERFACE, maybe you should also get it per
> interface so we can do something smarter when we add multi-channel?

We'll fix multi-channel later if needed. Main usage for this (from my
point of view) is for monitor interfaces.

Cheers,

Pontus