aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2010-07-27 15:58:08 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-07-27 15:08:20 -0400
commitd6541c74484a5679a79a1f1df9884fc4da8d8cf6 (patch)
treec15b9aeb9680bd8fa43d12d149764d1f7ac0c6b6 /drivers/net/wireless/libertas
parentdb08006fc4e825e632083f2a2de827ca2121c28d (diff)
libertas: remove Beacon Control
For now; it's a pretty easy command to hook up and whenever OLPC figures out how they want the userspace interface to look (ie, not iwpriv commands) we can easily add it back in. Since the cfg80211 conversion it wasn't working anyway. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r--drivers/net/wireless/libertas/cfg.h4
-rw-r--r--drivers/net/wireless/libertas/cmd.c3
-rw-r--r--drivers/net/wireless/libertas/cmdresp.c3
-rw-r--r--drivers/net/wireless/libertas/host.h3
4 files changed, 2 insertions, 11 deletions
diff --git a/drivers/net/wireless/libertas/cfg.h b/drivers/net/wireless/libertas/cfg.h
index e7ba4d84164d..4f46bb744bee 100644
--- a/drivers/net/wireless/libertas/cfg.h
+++ b/drivers/net/wireless/libertas/cfg.h
@@ -13,10 +13,6 @@ void lbs_cfg_free(struct lbs_private *priv);
13int lbs_reg_notifier(struct wiphy *wiphy, 13int lbs_reg_notifier(struct wiphy *wiphy,
14 struct regulatory_request *request); 14 struct regulatory_request *request);
15 15
16/* All of those are TODOs: */
17#define lbs_cmd_bcn_ctrl(priv, cmdptr, cmd_action) (0)
18#define lbs_ret_802_11_bcn_ctrl(priv, resp) (0)
19
20void lbs_send_disconnect_notification(struct lbs_private *priv); 16void lbs_send_disconnect_notification(struct lbs_private *priv);
21void lbs_send_mic_failureevent(struct lbs_private *priv, u32 event); 17void lbs_send_mic_failureevent(struct lbs_private *priv, u32 event);
22 18
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 15cfc52d6fd1..a09ee6b0a552 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -1216,9 +1216,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
1216 1216
1217#endif 1217#endif
1218 1218
1219 case CMD_802_11_BEACON_CTRL:
1220 ret = lbs_cmd_bcn_ctrl(priv, cmdptr, cmd_action);
1221 break;
1222 case CMD_802_11_DEEP_SLEEP: 1219 case CMD_802_11_DEEP_SLEEP:
1223 cmdptr->command = cpu_to_le16(CMD_802_11_DEEP_SLEEP); 1220 cmdptr->command = cpu_to_le16(CMD_802_11_DEEP_SLEEP);
1224 cmdptr->size = cpu_to_le16(sizeof(struct cmd_header)); 1221 cmdptr->size = cpu_to_le16(sizeof(struct cmd_header));
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index c3cbc8a1847d..6196e54125c6 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -130,9 +130,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
130 sizeof(resp->params.fwt)); 130 sizeof(resp->params.fwt));
131 spin_unlock_irqrestore(&priv->driver_lock, flags); 131 spin_unlock_irqrestore(&priv->driver_lock, flags);
132 break; 132 break;
133 case CMD_RET(CMD_802_11_BEACON_CTRL):
134 ret = lbs_ret_802_11_bcn_ctrl(priv, resp);
135 break;
136 133
137 default: 134 default:
138 lbs_pr_err("CMD_RESP: unknown cmd response 0x%04x\n", 135 lbs_pr_err("CMD_RESP: unknown cmd response 0x%04x\n",
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index 782fd157e5c2..7826f11cf60e 100644
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@ -595,6 +595,8 @@ struct cmd_ds_802_11_radio_control {
595} __packed; 595} __packed;
596 596
597struct cmd_ds_802_11_beacon_control { 597struct cmd_ds_802_11_beacon_control {
598 struct cmd_header hdr;
599
598 __le16 action; 600 __le16 action;
599 __le16 beacon_enable; 601 __le16 beacon_enable;
600 __le16 beacon_period; 602 __le16 beacon_period;
@@ -972,7 +974,6 @@ struct cmd_ds_command {
972 974
973 struct cmd_ds_bt_access bt; 975 struct cmd_ds_bt_access bt;
974 struct cmd_ds_fwt_access fwt; 976 struct cmd_ds_fwt_access fwt;
975 struct cmd_ds_802_11_beacon_control bcn_ctrl;
976 } params; 977 } params;
977} __packed; 978} __packed;
978#endif 979#endif