[PATCH] zd1211rw: monitor all packets

While in monitor mode the zd1211rw received only a limited
set of packets. This patch forwards now all packets the device
receives. Notify that while monitoring no FCS checks are done; so
strange packets might appear in the network sniffer of your
choice.

ATTENTION: Support for multiple interfaces on a single ZD1211
device is currently broken. So this code works only on the first
interface.

Here is an example to put the device in monitor mode.

iwconfig wlan0 mode monitor
ifconfig wlan0 up
iwconfig wlan0 channel 10

[dsd@gentoo.org: backport to mainline]
Signed-off-by: Ulrich Kunitz <kune@deine-taler.de>
Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/zd1211rw/zd_chip.h b/drivers/net/wireless/zd1211rw/zd_chip.h
index f4698576ab7106e267fb4e0a98e495df0ac0c71f..8009b70213e2d21abbda4a7842cb4d078d0cddc7 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_chip.h
+++ b/drivers/net/wireless/zd1211rw/zd_chip.h
@@ -871,11 +871,6 @@ static inline int zd_chip_set_basic_rates(struct zd_chip *chip, u16 cr_rates)
        return r;
 }
 
-static inline int zd_chip_set_rx_filter(struct zd_chip *chip, u32 filter)
-{
-       return zd_iowrite32(chip, CR_RX_FILTER, filter);
-}
-
 int zd_chip_lock_phy_regs(struct zd_chip *chip);
 int zd_chip_unlock_phy_regs(struct zd_chip *chip);
 

diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 26869d107e52acbc4c04b322272b0806cea74ca2..7ec1fcf37fc38ddeaa29c0fc2168559dd8be51ff 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -161,13 +161,33 @@ void zd_mac_clear(struct zd_mac *mac)
        ZD_MEMCLEAR(mac, sizeof(struct zd_mac));
 }
 
-static int reset_mode(struct zd_mac *mac)
+static int set_rx_filter(struct zd_mac *mac)
 {
        struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);
        u32 filter = (ieee->iw_mode == IW_MODE_MONITOR) ? ~0 : STA_RX_FILTER;
        return zd_iowrite32(&mac->chip, CR_RX_FILTER, filter);
 }
 
+static int set_sniffer(struct zd_mac *mac)
+{
+       struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);
+       return zd_iowrite32(&mac->chip, CR_SNIFFER_ON,
+               ieee->iw_mode == IW_MODE_MONITOR ? 1 : 0);
+       return 0;
+}
+
+static int set_mc_hash(struct zd_mac *mac)
+{
+       struct zd_mc_hash hash;
+       struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);
+
+       zd_mc_clear(&hash);
+       if (ieee->iw_mode == IW_MODE_MONITOR)
+               zd_mc_add_all(&hash);
+
+       return zd_chip_set_multicast_hash(&mac->chip, &hash);
+}
+
 int zd_mac_open(struct net_device *netdev)
 {
        struct zd_mac *mac = zd_netdev_mac(netdev);
@@ -194,7 +214,13 @@ int zd_mac_open(struct net_device *netdev)
        r = zd_chip_set_basic_rates(chip, CR_RATES_80211B | CR_RATES_80211G);
        if (r < 0)
                goto disable_int;
-       r = reset_mode(mac);
+       r = set_rx_filter(mac);
+       if (r)
+               goto disable_int;
+       r = set_sniffer(mac);
+       if (r)
+               goto disable_int;
+       r = set_mc_hash(mac);
        if (r)
                goto disable_int;
        r = zd_chip_switch_radio_on(chip);
@@ -298,12 +324,14 @@ static void set_multicast_hash_handler(struct work_struct *work)
 
 void zd_mac_set_multicast_list(struct net_device *dev)
 {
-       struct zd_mc_hash hash;
        struct zd_mac *mac = zd_netdev_mac(dev);
+       struct ieee80211_device *ieee = zd_mac_to_ieee80211(mac);
+       struct zd_mc_hash hash;
        struct dev_mc_list *mc;
        unsigned long flags;
 
-       if (dev->flags & (IFF_PROMISC|IFF_ALLMULTI)) {
+       if (dev->flags & (IFF_PROMISC|IFF_ALLMULTI) ||
+                       ieee->iw_mode == IW_MODE_MONITOR) {
                zd_mc_add_all(&hash);
        } else {
                zd_mc_clear(&hash);
@@ -628,8 +656,12 @@ int zd_mac_set_mode(struct zd_mac *mac, u32 mode)
        ieee->iw_mode = mode;
        spin_unlock_irq(&ieee->lock);
 
-       if (netif_running(mac->netdev))
-               return reset_mode(mac);
+       if (netif_running(mac->netdev)) {
+               int r = set_rx_filter(mac);
+               if (r)
+                       return r;
+               return set_sniffer(mac);
+       }
 
        return 0;
 }