On Tue, 2012-06-26 at 14:30 +0200, Michal Kazior wrote:
> +++ b/net/wireless/nl80211.c
> @@ -1588,17 +1588,11 @@ 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;
> + if (rdev->monitor_channel) {
> + nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ,
> + rdev->monitor_channel->center_freq);
> + nla_put_u32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
> + rdev->monitor_channel_type);
Tiny comment here -- you're removing nla_put error handling.
johannes
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
