On Mon, Jul 19, 2010 at 8:41 PM, David Gnedt <david.gnedt@xxxxxxxxxxx> wrote: > The cfg80211_set_freq function now also saves the channel for monitor > interfaces. > This fixes a issue were the WEXT ioctl GIWFREQ doesn't report the correct > channel when the channel was switched in monitor mode. > > Signed-off-by: David Gnedt <david.gnedt@xxxxxxxxxxx> > --- > net/wireless/chan.c | 7 +++---- > 1 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/net/wireless/chan.c b/net/wireless/chan.c > index d0c92dd..fd05938 100644 > --- a/net/wireless/chan.c > +++ b/net/wireless/chan.c > @@ -51,9 +51,6 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev, > struct ieee80211_channel *chan; > int result; > > - if (wdev && wdev->iftype == NL80211_IFTYPE_MONITOR) > - wdev = NULL; > - > if (wdev) { > ASSERT_WDEV_LOCK(wdev); > > @@ -69,7 +66,9 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev, > return -EINVAL; > > result = rdev->ops->set_channel(&rdev->wiphy, > - wdev ? wdev->netdev : NULL, > + wdev && wdev->iftype != > + NL80211_IFTYPE_MONITOR ? > + wdev->netdev : NULL, Just out of curiosity: why is it important to pass NULL as netdev for monitor interfaces? > chan, channel_type); > if (result) > return result; > -- > 1.6.3.3 > > -- > 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 > -- Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-) -- 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