[PATCH] libertas: monitor mode support for OLPC firmware

Driver support for the monitor mode support that will be available in the next
OLPC 'bleeding edge' Marvell firmware release (most likely, 5.110.16.p2).

To activate monitor mode,

echo mode > /sys/class/net/{ethX,mshX}/device/libertas_rtap

where mode is the hex mask that specifies which frames to sniff (in short, 0x1
for data, 0x2 for all management but beacons, 0x4 for beacons). Any non zero
mode will activate the monitor mode, inhibiting transmission in ethX and mshX
interfaces and routing all the incoming traffic to a new rtapX interface that
will output the packets in 802.11+radiotap headers format.

Signed-off-by: Luis Carlos Cobo <luisca@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 25 insertions, 0 deletions

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 517489a06063..cd3bddb243b1 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -565,6 +565,26 @@ static int wlan_cmd_802_11_rf_tx_power(wlan_private * priv,
         return 0;
 }
 
+static int wlan_cmd_802_11_monitor_mode(wlan_private * priv,
+                                      struct cmd_ds_command *cmd,
+                                      u16 cmd_action, void *pdata_buf)
+{
+        struct cmd_ds_802_11_monitor_mode *monitor = &cmd->params.monitor;
+
+        cmd->command = cpu_to_le16(CMD_802_11_MONITOR_MODE);
+        cmd->size =
+            cpu_to_le16(sizeof(struct cmd_ds_802_11_monitor_mode) +
+                             S_DS_GEN);
+
+        monitor->action = cpu_to_le16(cmd_action);
+        if (cmd_action == CMD_ACT_SET) {
+                monitor->mode =
+                    cpu_to_le16((u16) (*(u32 *) pdata_buf));
+        }
+
+        return 0;
+}
+
 static int wlan_cmd_802_11_rate_adapt_rateset(wlan_private * priv,
                                               struct cmd_ds_command *cmd,
                                               u16 cmd_action)
@@ -1239,6 +1259,11 @@ int libertas_prepare_and_send_command(wlan_private * priv,
                 ret = wlan_cmd_mac_multicast_adr(priv, cmdptr, cmd_action);
                 break;
 
+        case CMD_802_11_MONITOR_MODE:
+                ret = wlan_cmd_802_11_monitor_mode(priv, cmdptr,
+                                          cmd_action, pdata_buf);
+                break;
+
         case CMD_802_11_AD_HOC_JOIN:
                 ret = libertas_cmd_80211_ad_hoc_join(priv, cmdptr, pdata_buf);
                 break;