aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/libertas/cmd.c13
-rw-r--r--drivers/net/wireless/libertas/cmdresp.c9
-rw-r--r--drivers/net/wireless/libertas/host.h4
3 files changed, 3 insertions, 23 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 76a892eeef10..15cfc52d6fd1 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1204,19 +1204,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
1204 ret = lbs_cmd_reg_access(cmdptr, cmd_action, pdata_buf); 1204 ret = lbs_cmd_reg_access(cmdptr, cmd_action, pdata_buf);
1205 break; 1205 break;
1206 1206
1207 case CMD_802_11_SET_AFC:
1208 case CMD_802_11_GET_AFC:
1209
1210 cmdptr->command = cpu_to_le16(cmd_no);
1211 cmdptr->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_afc) +
1212 sizeof(struct cmd_header));
1213
1214 memmove(&cmdptr->params.afc,
1215 pdata_buf, sizeof(struct cmd_ds_802_11_afc));
1216
1217 ret = 0;
1218 goto done;
1219
1220#ifdef CONFIG_LIBERTAS_MESH 1207#ifdef CONFIG_LIBERTAS_MESH
1221 1208
1222 case CMD_BT_ACCESS: 1209 case CMD_BT_ACCESS:
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index 6bc40c6a243f..c3cbc8a1847d 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -113,15 +113,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
113 ret = lbs_ret_reg_access(priv, respcmd, resp); 113 ret = lbs_ret_reg_access(priv, respcmd, resp);
114 break; 114 break;
115 115
116 case CMD_RET(CMD_802_11_SET_AFC):
117 case CMD_RET(CMD_802_11_GET_AFC):
118 spin_lock_irqsave(&priv->driver_lock, flags);
119 memmove((void *)priv->cur_cmd->callback_arg, &resp->params.afc,
120 sizeof(struct cmd_ds_802_11_afc));
121 spin_unlock_irqrestore(&priv->driver_lock, flags);
122
123 break;
124
125 case CMD_RET(CMD_802_11_BEACON_STOP): 116 case CMD_RET(CMD_802_11_BEACON_STOP):
126 break; 117 break;
127 118
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index f877bb886c88..782fd157e5c2 100644
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@ -882,7 +882,10 @@ struct cmd_ds_802_11_led_ctrl {
882 u8 data[256]; 882 u8 data[256];
883} __packed; 883} __packed;
884 884
885/* Automatic Frequency Control */
885struct cmd_ds_802_11_afc { 886struct cmd_ds_802_11_afc {
887 struct cmd_header hdr;
888
886 __le16 afc_auto; 889 __le16 afc_auto;
887 union { 890 union {
888 struct { 891 struct {
@@ -965,7 +968,6 @@ struct cmd_ds_command {
965 struct cmd_ds_bbp_reg_access bbpreg; 968 struct cmd_ds_bbp_reg_access bbpreg;
966 struct cmd_ds_rf_reg_access rfreg; 969 struct cmd_ds_rf_reg_access rfreg;
967 970
968 struct cmd_ds_802_11_afc afc;
969 struct cmd_ds_802_11_led_ctrl ledgpio; 971 struct cmd_ds_802_11_led_ctrl ledgpio;
970 972
971 struct cmd_ds_bt_access bt; 973 struct cmd_ds_bt_access bt;