[PATCH] zd1211rw: Remove IW_FREQ_AUTO support

http://bugzilla.kernel.org/show_bug.cgi?id=7399

zd1211rw's support for IW_FREQ_AUTO is broken: when specified, the driver
tries to change to a channel specified in an uninitialized integer. As
IW_FREQ_AUTO is hard to implement properly, the solution (at least for now)
is to drop support for it and start ignoring the flags like all other wireless
drivers do.

This has the added advantage that kismet also starts working with zd1211rw,
even though kismet requesting IW_FREQ_AUTO is also a bug (fixed in their svn)

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 1 insertions, 12 deletions

diff --git a/drivers/net/wireless/zd1211rw/zd_netdev.c b/drivers/net/wireless/zd1211rw/zd_netdev.c
index af3a7b36d07..60f1b0f6d45 100644
--- a/drivers/net/wireless/zd1211rw/zd_netdev.c
+++ b/drivers/net/wireless/zd1211rw/zd_netdev.c
@@ -107,21 +107,10 @@ static int iw_get_freq(struct net_device *netdev,
                    struct iw_request_info *info,
                    union iwreq_data *req, char *extra)
 {
-        int r;
         struct zd_mac *mac = zd_netdev_mac(netdev);
         struct iw_freq *freq = &req->freq;
-        u8 channel;
-        u8 flags;
-
-        r = zd_mac_get_channel(mac, &channel, &flags);
-        if (r)
-                return r;
 
-        freq->flags = (flags & MAC_FIXED_CHANNEL) ?
-                      IW_FREQ_FIXED : IW_FREQ_AUTO;
-        dev_dbg_f(zd_mac_dev(mac), "channel %s\n",
-                  (flags & MAC_FIXED_CHANNEL) ? "fixed" : "auto");
-        return zd_channel_to_freq(freq, channel);
+        return zd_channel_to_freq(freq, zd_mac_get_channel(mac));
 }
 
 static int iw_set_mode(struct net_device *netdev,