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]>
Signed-off-by: John W. Linville <[email protected]>
This commit is contained in:
Pontus Fuchs 2012-04-03 16:39:58 +02:00 • committed by John W. Linville
commit d91df0e3a1
4 changed files with 20 additions and 3 deletions

View file

@ -1501,6 +1501,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:

View file

@ -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;