diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-18 14:17:13 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-18 14:27:48 -0400 |
| commit | 59ef43e681d103a51c3727dad0315e093f07ec61 (patch) | |
| tree | 87f6320f1440ce3ce6c0c15ad3cef8bc98186f88 /net/wireless/nl80211.c | |
| parent | 91fbe33034c184c6a60e31c2207a2f7ec2f180dc (diff) | |
| parent | b5abcf0219263f4e961dca71cbe26e06c5b0ee68 (diff) | |
| download | linux-59ef43e681d103a51c3727dad0315e093f07ec61.tar.gz linux-59ef43e681d103a51c3727dad0315e093f07ec61.tar.bz2 linux-59ef43e681d103a51c3727dad0315e093f07ec61.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
include/net/nfc/nfc.h
net/nfc/netlink.c
net/wireless/nl80211.c
Diffstat (limited to 'net/wireless/nl80211.c')
| -rw-r--r-- | net/wireless/nl80211.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index ff1a6c7fbe33..83d71d6b63a4 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -1540,6 +1540,19 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 pid, u32 seq, int flags, (cfg80211_rdev_list_generation << 2))) goto nla_put_failure; + 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))) + goto nla_put_failure; + } + return genlmsg_end(msg, hdr); nla_put_failure: |