leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] zd1211rw: Fixed array size issue in reset_mode

Browse Source 
Andy Green found this issue.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Ulrich Kunitz 2007-01-29 00:59:40 +00:00 committed by John W. Linville
parent 6e3632f661
commit fa8e29cff7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/zd1211rw/zd_mac.c
View File

@ -156,7 +156,7 @@ void zd_mac_clear(struct zd_mac *mac)
static int reset_mode(struct zd_mac *mac) static int reset_mode(struct zd_mac *mac)
{ {
struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac); struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);
struct zd_ioreq32 ioreqs[3] = { struct zd_ioreq32 ioreqs[] = {
{ CR_RX_FILTER, STA_RX_FILTER }, { CR_RX_FILTER, STA_RX_FILTER },
{ CR_SNIFFER_ON, 0U }, { CR_SNIFFER_ON, 0U },
}; };
@ -164,10 +164,9 @@ static int reset_mode(struct zd_mac *mac)
if (ieee->iw_mode == IW_MODE_MONITOR) { if (ieee->iw_mode == IW_MODE_MONITOR) {
ioreqs[0].value = 0xffffffff; ioreqs[0].value = 0xffffffff;
ioreqs[1].value = 0x1; ioreqs[1].value = 0x1;
ioreqs[2].value = ENC_SNIFFER;
} }
return zd_iowrite32a(&mac->chip, ioreqs, 3); return zd_iowrite32a(&mac->chip, ioreqs, ARRAY_SIZE(ioreqs));
} }
int zd_mac_open(struct net_device *netdev) int zd_mac_open(struct net_device *netdev)