Skip to content

Commit

Permalink
libertas: clean up MONITOR_MODE command
Browse files Browse the repository at this point in the history 
Convert to a full direct command; previous code rolled a direct
command by handle but left the original indirect command code
lying around.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Dan Williams authored and John W. Linville committed Jul 27, 2010
1 parent 98ec621 commit a45b6f4
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 72 deletions.
57 changes: 3 additions & 54 deletions drivers/net/wireless/libertas/cfg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*/

#include <linux/slab.h>
#include <linux/if_arp.h>
#include <linux/ieee80211.h>
#include <net/cfg80211.h>
#include <asm/unaligned.h>
Expand Down Expand Up @@ -1383,56 +1382,6 @@ static int lbs_cfg_del_key(struct wiphy *wiphy, struct net_device *netdev,
}



/***************************************************************************
* Monitor mode
*/

/* like "struct cmd_ds_802_11_monitor_mode", but with cmd_header. Once we
* get rid of WEXT, this should go into host.h */
struct cmd_monitor_mode {
struct cmd_header hdr;

__le16 action;
__le16 mode;
} __packed;

static int lbs_enable_monitor_mode(struct lbs_private *priv, int mode)
{
struct cmd_monitor_mode cmd;
int ret;

lbs_deb_enter(LBS_DEB_CFG80211);

/*
* cmd 98 00
* size 0c 00
* sequence xx xx
* result 00 00
* action 01 00 ACT_SET
* enable 01 00
*/
memset(&cmd, 0, sizeof(cmd));
cmd.hdr.size = cpu_to_le16(sizeof(cmd));
cmd.action = cpu_to_le16(CMD_ACT_SET);
cmd.mode = cpu_to_le16(mode);

ret = lbs_cmd_with_response(priv, CMD_802_11_MONITOR_MODE, &cmd);

if (ret == 0)
priv->dev->type = ARPHRD_IEEE80211_RADIOTAP;
else
priv->dev->type = ARPHRD_ETHER;

lbs_deb_leave(LBS_DEB_CFG80211);
return ret;
}






/***************************************************************************
* Get station
*/
Expand Down Expand Up @@ -1558,17 +1507,17 @@ static int lbs_change_intf(struct wiphy *wiphy, struct net_device *dev,

switch (type) {
case NL80211_IFTYPE_MONITOR:
ret = lbs_enable_monitor_mode(priv, 1);
ret = lbs_set_monitor_mode(priv, 1);
break;
case NL80211_IFTYPE_STATION:
if (priv->wdev->iftype == NL80211_IFTYPE_MONITOR)
ret = lbs_enable_monitor_mode(priv, 0);
ret = lbs_set_monitor_mode(priv, 0);
if (!ret)
ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_BSS_TYPE, 1);
break;
case NL80211_IFTYPE_ADHOC:
if (priv->wdev->iftype == NL80211_IFTYPE_MONITOR)
ret = lbs_enable_monitor_mode(priv, 0);
ret = lbs_set_monitor_mode(priv, 0);
if (!ret)
ret = lbs_set_snmp_mib(priv, SNMP_MIB_OID_BSS_TYPE, 2);
break;
Expand Down
42 changes: 25 additions & 17 deletions drivers/net/wireless/libertas/cmd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <linux/kfifo.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/if_arp.h>

#include "decl.h"
#include "cfg.h"
Expand Down Expand Up @@ -576,23 +577,35 @@ int lbs_set_tx_power(struct lbs_private *priv, s16 dbm)
return ret;
}

static int lbs_cmd_802_11_monitor_mode(struct cmd_ds_command *cmd,
u16 cmd_action, void *pdata_buf)
/**
* @brief Enable or disable monitor mode (only implemented on OLPC usb8388 FW)
*
* @param priv A pointer to struct lbs_private structure
* @param enable 1 to enable monitor mode, 0 to disable
*
* @return 0 on success, error on failure
*/
int lbs_set_monitor_mode(struct lbs_private *priv, int enable)
{
struct cmd_ds_802_11_monitor_mode *monitor = &cmd->params.monitor;
struct cmd_ds_802_11_monitor_mode cmd;
int ret;

cmd->command = cpu_to_le16(CMD_802_11_MONITOR_MODE);
cmd->size =
cpu_to_le16(sizeof(struct cmd_ds_802_11_monitor_mode) +
sizeof(struct cmd_header));
memset(&cmd, 0, sizeof(cmd));
cmd.hdr.size = cpu_to_le16(sizeof(cmd));
cmd.action = cpu_to_le16(CMD_ACT_SET);
if (enable)
cmd.mode = cpu_to_le16(0x1);

monitor->action = cpu_to_le16(cmd_action);
if (cmd_action == CMD_ACT_SET) {
monitor->mode =
cpu_to_le16((u16) (*(u32 *) pdata_buf));
lbs_deb_cmd("SET_MONITOR_MODE: %d\n", enable);

ret = lbs_cmd_with_response(priv, CMD_802_11_MONITOR_MODE, &cmd);
if (ret == 0) {
priv->dev->type = enable ? ARPHRD_IEEE80211_RADIOTAP :
ARPHRD_ETHER;
}

return 0;
lbs_deb_leave(LBS_DEB_CMD);
return ret;
}

/**
Expand Down Expand Up @@ -1093,11 +1106,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
ret = lbs_cmd_reg_access(cmdptr, cmd_action, pdata_buf);
break;

case CMD_802_11_MONITOR_MODE:
ret = lbs_cmd_802_11_monitor_mode(cmdptr,
cmd_action, pdata_buf);
break;

case CMD_802_11_RSSI:
ret = lbs_cmd_802_11_rssi(priv, cmdptr);
break;
Expand Down
2 changes: 2 additions & 0 deletions drivers/net/wireless/libertas/cmd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,6 @@ int lbs_set_deep_sleep(struct lbs_private *priv, int deep_sleep);

int lbs_set_host_sleep(struct lbs_private *priv, int host_sleep);

int lbs_set_monitor_mode(struct lbs_private *priv, int enable);

#endif /* _LBS_CMD_H */
4 changes: 3 additions & 1 deletion drivers/net/wireless/libertas/host.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,10 @@ struct cmd_ds_802_11_rf_tx_power {
s8 minlevel;
} __packed;

/* MONITOR_MODE only exists in OLPC v5 firmware */
struct cmd_ds_802_11_monitor_mode {
struct cmd_header hdr;

__le16 action;
__le16 mode;
} __packed;
Expand Down Expand Up @@ -966,7 +969,6 @@ struct cmd_ds_command {
/* command Body */
union {
struct cmd_ds_802_11_ps_mode psmode;
struct cmd_ds_802_11_monitor_mode monitor;
struct cmd_ds_802_11_rssi rssi;
struct cmd_ds_802_11_rssi_rsp rssirsp;
struct cmd_ds_mac_reg_access macreg;
Expand Down

0 comments on commit a45b6f4

Please sign in to comment.