Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84bc715c authored by Daniel Drake's avatar Daniel Drake Committed by Jeff Garzik
Browse files

[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: default avatarDaniel Drake <dsd@gentoo.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 571d6eee

drivers/net/wireless/zd1211rw/zd_ieee80211.c

+0 −3
Original line number Diff line number Diff line
@@ -133,9 +133,6 @@ int zd_find_channel(u8 *channel, const struct iw_freq *freq) 
	int i, r;

	u32 mhz;



	if (!(freq->flags & IW_FREQ_FIXED))

		return 0;



	if (freq->m < 1000) {

		if (freq->m  > NUM_CHANNELS || freq->m == 0)

			return -EINVAL;

drivers/net/wireless/zd1211rw/zd_mac.c

+4 −13
Original line number Diff line number Diff line
@@ -317,21 +317,12 @@ int zd_mac_request_channel(struct zd_mac *mac, u8 channel) 
		return 0;

}



int zd_mac_get_channel(struct zd_mac *mac, u8 *channel, u8 *flags)

u8 zd_mac_get_channel(struct zd_mac *mac)

{

	struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);

	u8 channel = zd_chip_get_channel(&mac->chip);



	*channel = zd_chip_get_channel(&mac->chip);

	if (ieee->iw_mode != IW_MODE_INFRA) {

		spin_lock_irq(&mac->lock);

		*flags = *channel == mac->requested_channel ?

			MAC_FIXED_CHANNEL : 0;

		spin_unlock(&mac->lock);

	} else {

		*flags = 0;

	}

	dev_dbg_f(zd_mac_dev(mac), "channel %u flags %u\n", *channel, *flags);

	return 0;

	dev_dbg_f(zd_mac_dev(mac), "channel %u\n", channel);

	return channel;

}



/* If wrong rate is given, we are falling back to the slowest rate: 1MBit/s */

drivers/net/wireless/zd1211rw/zd_mac.h

+1 −5
Original line number Diff line number Diff line
@@ -116,10 +116,6 @@ struct rx_status { 
#define ZD_RX_CRC16_ERROR		0x40

#define ZD_RX_ERROR			0x80



enum mac_flags {

	MAC_FIXED_CHANNEL = 0x01,

};



struct housekeeping {

	struct work_struct link_led_work;

};
@@ -180,7 +176,7 @@ int zd_mac_set_regdomain(struct zd_mac *zd_mac, u8 regdomain); 
u8 zd_mac_get_regdomain(struct zd_mac *zd_mac);



int zd_mac_request_channel(struct zd_mac *mac, u8 channel);

int zd_mac_get_channel(struct zd_mac *mac, u8 *channel, u8 *flags);

u8 zd_mac_get_channel(struct zd_mac *mac);



int zd_mac_set_mode(struct zd_mac *mac, u32 mode);

int zd_mac_get_mode(struct zd_mac *mac, u32 *mode);

drivers/net/wireless/zd1211rw/zd_netdev.c

+1 −12
Original line number Diff line number Diff line
@@ -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,