dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

libertas: convert CMD_MESH_ACCESS to a direct command 

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
David Woodhouse 2007-12-11 15:23:59 -05:00 committed by David S. Miller
parent ad9d7a7f3c
commit 301eacbf30
6 changed files with 39 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/wireless/libertas/cmd.c
View File

@ -976,27 +976,25 @@ static int lbs_cmd_fwt_access(struct lbs_private *priv,
return 0; return 0;
} }
static int lbs_cmd_mesh_access(struct lbs_private *priv, int lbs_mesh_access(struct lbs_private *priv, uint16_t cmd_action,
struct cmd_ds_command *cmd, struct cmd_ds_mesh_access *cmd)
u16 cmd_action, void *pdata_buf)
{ {
struct cmd_ds_mesh_access *mesh_access = &cmd->params.mesh; int ret;
lbs_deb_enter_args(LBS_DEB_CMD, "action %d", cmd_action); lbs_deb_enter_args(LBS_DEB_CMD, "action %d", cmd_action);
cmd->command = cpu_to_le16(CMD_MESH_ACCESS); cmd->hdr.command = cpu_to_le16(CMD_MESH_ACCESS);
cmd->size = cpu_to_le16(sizeof(struct cmd_ds_mesh_access) + S_DS_GEN); cmd->hdr.size = cpu_to_le16(sizeof(struct cmd_ds_mesh_access) + S_DS_GEN);
cmd->result = 0; cmd->hdr.result = 0;
if (pdata_buf) cmd->action = cpu_to_le16(cmd_action);
memcpy(mesh_access, pdata_buf, sizeof(*mesh_access));
else
memset(mesh_access, 0, sizeof(*mesh_access));
mesh_access->action = cpu_to_le16(cmd_action); ret = lbs_cmd_with_response(priv, CMD_MESH_ACCESS, (*cmd));
lbs_deb_leave(LBS_DEB_CMD); lbs_deb_leave(LBS_DEB_CMD);
return 0; return ret;
} }
EXPORT_SYMBOL_GPL(lbs_mesh_access);
static int lbs_cmd_bcn_ctrl(struct lbs_private * priv, static int lbs_cmd_bcn_ctrl(struct lbs_private * priv,
struct cmd_ds_command *cmd, struct cmd_ds_command *cmd,
@ -1486,10 +1484,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
ret = lbs_cmd_fwt_access(priv, cmdptr, cmd_action, pdata_buf); ret = lbs_cmd_fwt_access(priv, cmdptr, cmd_action, pdata_buf);
break; break;
case CMD_MESH_ACCESS:
ret = lbs_cmd_mesh_access(priv, cmdptr, cmd_action, pdata_buf);
break;
case CMD_GET_TSF: case CMD_GET_TSF:
cmdptr->command = cpu_to_le16(CMD_GET_TSF); cmdptr->command = cpu_to_le16(CMD_GET_TSF);
cmdptr->size = cpu_to_le16(sizeof(struct cmd_ds_get_tsf) + cmdptr->size = cpu_to_le16(sizeof(struct cmd_ds_get_tsf) +

3
drivers/net/wireless/libertas/cmd.h
View File

@ -24,4 +24,7 @@ int lbs_cmd_copyback(struct lbs_private *priv, unsigned long extra,
int lbs_update_hw_spec(struct lbs_private *priv); int lbs_update_hw_spec(struct lbs_private *priv);
int lbs_mesh_access(struct lbs_private *priv, uint16_t cmd_action,
struct cmd_ds_mesh_access *cmd);
#endif /* _LBS_CMD_H */ #endif /* _LBS_CMD_H */

5
drivers/net/wireless/libertas/cmdresp.c
View File

@ -653,11 +653,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
sizeof(resp->params.fwt)); sizeof(resp->params.fwt));
spin_unlock_irqrestore(&priv->driver_lock, flags); spin_unlock_irqrestore(&priv->driver_lock, flags);
break; break;
case CMD_RET(CMD_MESH_ACCESS):
if (priv->cur_cmd->pdata_buf)
memcpy(priv->cur_cmd->pdata_buf, &resp->params.mesh,
sizeof(resp->params.mesh));
break;
case CMD_RET(CMD_802_11_BEACON_CTRL): case CMD_RET(CMD_802_11_BEACON_CTRL):
ret = lbs_ret_802_11_bcn_ctrl(priv, resp); ret = lbs_ret_802_11_bcn_ctrl(priv, resp);
break; break;

3
drivers/net/wireless/libertas/hostcmd.h
View File

@ -623,6 +623,8 @@ struct cmd_ds_fwt_access {
} __attribute__ ((packed)); } __attribute__ ((packed));
struct cmd_ds_mesh_access { struct cmd_ds_mesh_access {
struct cmd_header hdr;
__le16 action; __le16 action;
__le32 data[32]; /* last position reserved */ __le32 data[32]; /* last position reserved */
} __attribute__ ((packed)); } __attribute__ ((packed));
@ -687,7 +689,6 @@ struct cmd_ds_command {
struct cmd_tx_rate_query txrate; struct cmd_tx_rate_query txrate;
struct cmd_ds_bt_access bt; struct cmd_ds_bt_access bt;
struct cmd_ds_fwt_access fwt; struct cmd_ds_fwt_access fwt;
struct cmd_ds_mesh_access mesh;
struct cmd_ds_get_tsf gettsf; struct cmd_ds_get_tsf gettsf;
struct cmd_ds_802_11_subscribe_event subscribe_event; struct cmd_ds_802_11_subscribe_event subscribe_event;
struct cmd_ds_802_11_beacon_control bcn_ctrl; struct cmd_ds_802_11_beacon_control bcn_ctrl;

11
drivers/net/wireless/libertas/if_usb.c
View File

@ -990,11 +990,9 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
*/ */
struct cmd_ds_mesh_access mesh_access; struct cmd_ds_mesh_access mesh_access;
memset(&mesh_access, 0, sizeof(mesh_access)); memset(&mesh_access, 0, sizeof(mesh_access));
mesh_access.data[0] = cpu_to_le32(1); mesh_access.data[0] = cpu_to_le32(1);
lbs_prepare_and_send_command(priv, lbs_mesh_access(priv, CMD_ACT_MESH_SET_AUTOSTART_ENABLED, &mesh_access);
CMD_MESH_ACCESS,
CMD_ACT_MESH_SET_AUTOSTART_ENABLED,
CMD_OPTION_WAITFORRSP, 0, (void *)&mesh_access);
} }
netif_device_detach(cardp->eth_dev); netif_device_detach(cardp->eth_dev);
@ -1031,10 +1029,7 @@ static int if_usb_resume(struct usb_interface *intf)
struct cmd_ds_mesh_access mesh_access; struct cmd_ds_mesh_access mesh_access;
memset(&mesh_access, 0, sizeof(mesh_access)); memset(&mesh_access, 0, sizeof(mesh_access));
mesh_access.data[0] = cpu_to_le32(0); mesh_access.data[0] = cpu_to_le32(0);
lbs_prepare_and_send_command(priv, lbs_mesh_access(priv, CMD_ACT_MESH_SET_AUTOSTART_ENABLED, &mesh_access);
CMD_MESH_ACCESS,
CMD_ACT_MESH_SET_AUTOSTART_ENABLED,
CMD_OPTION_WAITFORRSP, 0, (void *)&mesh_access);
} }
lbs_deb_leave(LBS_DEB_USB); lbs_deb_leave(LBS_DEB_USB);

40
drivers/net/wireless/libertas/main.c
View File

@ -217,13 +217,15 @@ u8 lbs_data_rate_to_fw_index(u32 rate)
static ssize_t lbs_anycast_get(struct device *dev, static ssize_t lbs_anycast_get(struct device *dev,
struct device_attribute *attr, char * buf) struct device_attribute *attr, char * buf)
{ {
struct lbs_private *priv = to_net_dev(dev)->priv;
struct cmd_ds_mesh_access mesh_access; struct cmd_ds_mesh_access mesh_access;
int ret;
memset(&mesh_access, 0, sizeof(mesh_access)); memset(&mesh_access, 0, sizeof(mesh_access));
lbs_prepare_and_send_command(to_net_dev(dev)->priv,
CMD_MESH_ACCESS, ret = lbs_mesh_access(priv, CMD_ACT_MESH_GET_ANYCAST, &mesh_access);
CMD_ACT_MESH_GET_ANYCAST, if (ret)
CMD_OPTION_WAITFORRSP, 0, (void *)&mesh_access); return ret;
return snprintf(buf, 12, "0x%X\n", le32_to_cpu(mesh_access.data[0])); return snprintf(buf, 12, "0x%X\n", le32_to_cpu(mesh_access.data[0]));
} }
@ -234,17 +236,19 @@ static ssize_t lbs_anycast_get(struct device *dev,
static ssize_t lbs_anycast_set(struct device *dev, static ssize_t lbs_anycast_set(struct device *dev,
struct device_attribute *attr, const char * buf, size_t count) struct device_attribute *attr, const char * buf, size_t count)
{ {
struct lbs_private *priv = to_net_dev(dev)->priv;
struct cmd_ds_mesh_access mesh_access; struct cmd_ds_mesh_access mesh_access;
uint32_t datum; uint32_t datum;
int ret;
memset(&mesh_access, 0, sizeof(mesh_access)); memset(&mesh_access, 0, sizeof(mesh_access));
sscanf(buf, "%x", &datum); sscanf(buf, "%x", &datum);
mesh_access.data[0] = cpu_to_le32(datum); mesh_access.data[0] = cpu_to_le32(datum);
lbs_prepare_and_send_command((to_net_dev(dev))->priv, ret = lbs_mesh_access(priv, CMD_ACT_MESH_SET_ANYCAST, &mesh_access);
CMD_MESH_ACCESS, if (ret)
CMD_ACT_MESH_SET_ANYCAST, return ret;
CMD_OPTION_WAITFORRSP, 0, (void *)&mesh_access);
return strlen(buf); return strlen(buf);
} }
@ -323,14 +327,15 @@ static DEVICE_ATTR(anycast_mask, 0644, lbs_anycast_get, lbs_anycast_set);
static ssize_t lbs_autostart_enabled_get(struct device *dev, static ssize_t lbs_autostart_enabled_get(struct device *dev,
struct device_attribute *attr, char * buf) struct device_attribute *attr, char * buf)
{ {
struct lbs_private *priv = to_net_dev(dev)->priv;
struct cmd_ds_mesh_access mesh_access; struct cmd_ds_mesh_access mesh_access;
int ret;
memset(&mesh_access, 0, sizeof(mesh_access)); memset(&mesh_access, 0, sizeof(mesh_access));
lbs_prepare_and_send_command(to_net_dev(dev)->priv,
CMD_MESH_ACCESS,
CMD_ACT_MESH_GET_AUTOSTART_ENABLED,
CMD_OPTION_WAITFORRSP, 0, (void *)&mesh_access);
ret = lbs_mesh_access(priv, CMD_ACT_MESH_GET_AUTOSTART_ENABLED, &mesh_access);
if (ret)
return ret;
return sprintf(buf, "%d\n", le32_to_cpu(mesh_access.data[0])); return sprintf(buf, "%d\n", le32_to_cpu(mesh_access.data[0]));
} }
@ -346,10 +351,7 @@ static ssize_t lbs_autostart_enabled_set(struct device *dev,
sscanf(buf, "%d", &datum); sscanf(buf, "%d", &datum);
mesh_access.data[0] = cpu_to_le32(datum); mesh_access.data[0] = cpu_to_le32(datum);
ret = lbs_prepare_and_send_command(priv, ret = lbs_mesh_access(priv, CMD_ACT_MESH_SET_AUTOSTART_ENABLED, &mesh_access);
CMD_MESH_ACCESS,
CMD_ACT_MESH_SET_AUTOSTART_ENABLED,
CMD_OPTION_WAITFORRSP, 0, (void *)&mesh_access);
if (ret == 0) if (ret == 0)
priv->mesh_autostart_enabled = datum ? 1 : 0; priv->mesh_autostart_enabled = datum ? 1 : 0;
@ -866,10 +868,8 @@ static int lbs_setup_firmware(struct lbs_private *priv)
if (priv->mesh_dev) { if (priv->mesh_dev) {
memset(&mesh_access, 0, sizeof(mesh_access)); memset(&mesh_access, 0, sizeof(mesh_access));
mesh_access.data[0] = cpu_to_le32(0); mesh_access.data[0] = cpu_to_le32(0);
ret = lbs_prepare_and_send_command(priv, ret = lbs_mesh_access(priv, CMD_ACT_MESH_SET_AUTOSTART_ENABLED,
CMD_MESH_ACCESS, &mesh_access);
CMD_ACT_MESH_SET_AUTOSTART_ENABLED,
CMD_OPTION_WAITFORRSP, 0, (void *)&mesh_access);
if (ret) { if (ret) {
ret = -1; ret = -1;
goto done; goto done;