iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cfg80211: Add channel information to NL80211_CMD_GET_INTERFACE

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

Signed-off-by: Pontus Fuchs <pontus.fuchs@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Pontus Fuchs 2012-04-03 16:39:58 +02:00 committed by John W. Linville
parent 3a4b43fde1
commit d91df0e3a1
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/cfg80211.h
View File

@ -1710,7 +1710,8 @@ struct cfg80211_ops {
struct net_device *dev, struct net_device *dev,
u16 noack_map); u16 noack_map);
struct ieee80211_channel *(*get_channel)(struct wiphy *wiphy); struct ieee80211_channel *(*get_channel)(struct wiphy *wiphy,
enum nl80211_channel_type *type);
}; };
/* /*

4
net/mac80211/cfg.c
View File

@ -2688,10 +2688,12 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev,
} }
static struct ieee80211_channel * 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); struct ieee80211_local *local = wiphy_priv(wiphy);
*type = local->_oper_channel_type;
return local->oper_channel; return local->oper_channel;
} }

13
net/wireless/nl80211.c
View File

@ -1501,6 +1501,19 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 pid, u32 seq, int flags,
rdev->devlist_generation ^ rdev->devlist_generation ^
(cfg80211_rdev_list_generation << 2)); (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); return genlmsg_end(msg, hdr);
nla_put_failure: nla_put_failure:

3
net/wireless/wext-compat.c
View File

@ -821,6 +821,7 @@ static int cfg80211_wext_giwfreq(struct net_device *dev,
struct wireless_dev *wdev = dev->ieee80211_ptr; struct wireless_dev *wdev = dev->ieee80211_ptr;
struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy);
struct ieee80211_channel *chan; struct ieee80211_channel *chan;
enum nl80211_channel_type channel_type;
switch (wdev->iftype) { switch (wdev->iftype) {
case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_STATION:
@ -831,7 +832,7 @@ static int cfg80211_wext_giwfreq(struct net_device *dev,
if (!rdev->ops->get_channel) if (!rdev->ops->get_channel)
return -EINVAL; return -EINVAL;
chan = rdev->ops->get_channel(wdev->wiphy); chan = rdev->ops->get_channel(wdev->wiphy, &channel_type);
if (!chan) if (!chan)
return -EINVAL; return -EINVAL;
freq->m = chan->center_freq; freq->m = chan->center_freq;