From cf9bb80b5b14354db3689073d15d4251a1a633c5 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Tue, 27 Jul 2010 12:58:08 -0700
Subject: [PATCH] --- yaml --- r: 203902 b: refs/heads/master c:
 d6541c74484a5679a79a1f1df9884fc4da8d8cf6 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/libertas/cfg.h     | 4 ----
 trunk/drivers/net/wireless/libertas/cmd.c     | 3 ---
 trunk/drivers/net/wireless/libertas/cmdresp.c | 3 ---
 trunk/drivers/net/wireless/libertas/host.h    | 3 ++-
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 31658482d648..e1a9f24119cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db08006fc4e825e632083f2a2de827ca2121c28d
+refs/heads/master: d6541c74484a5679a79a1f1df9884fc4da8d8cf6
diff --git a/trunk/drivers/net/wireless/libertas/cfg.h b/trunk/drivers/net/wireless/libertas/cfg.h
index e7ba4d84164d..4f46bb744bee 100644
--- a/trunk/drivers/net/wireless/libertas/cfg.h
+++ b/trunk/drivers/net/wireless/libertas/cfg.h
@@ -13,10 +13,6 @@ void lbs_cfg_free(struct lbs_private *priv);
 int lbs_reg_notifier(struct wiphy *wiphy,
 		struct regulatory_request *request);
 
-/* All of those are TODOs: */
-#define lbs_cmd_bcn_ctrl(priv, cmdptr, cmd_action) (0)
-#define lbs_ret_802_11_bcn_ctrl(priv, resp) (0)
-
 void lbs_send_disconnect_notification(struct lbs_private *priv);
 void lbs_send_mic_failureevent(struct lbs_private *priv, u32 event);
 
diff --git a/trunk/drivers/net/wireless/libertas/cmd.c b/trunk/drivers/net/wireless/libertas/cmd.c
index 15cfc52d6fd1..a09ee6b0a552 100644
--- a/trunk/drivers/net/wireless/libertas/cmd.c
+++ b/trunk/drivers/net/wireless/libertas/cmd.c
@@ -1216,9 +1216,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
 
 #endif
 
-	case CMD_802_11_BEACON_CTRL:
-		ret = lbs_cmd_bcn_ctrl(priv, cmdptr, cmd_action);
-		break;
 	case CMD_802_11_DEEP_SLEEP:
 		cmdptr->command = cpu_to_le16(CMD_802_11_DEEP_SLEEP);
 		cmdptr->size = cpu_to_le16(sizeof(struct cmd_header));
diff --git a/trunk/drivers/net/wireless/libertas/cmdresp.c b/trunk/drivers/net/wireless/libertas/cmdresp.c
index c3cbc8a1847d..6196e54125c6 100644
--- a/trunk/drivers/net/wireless/libertas/cmdresp.c
+++ b/trunk/drivers/net/wireless/libertas/cmdresp.c
@@ -130,9 +130,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
 			       sizeof(resp->params.fwt));
 		spin_unlock_irqrestore(&priv->driver_lock, flags);
 		break;
-	case CMD_RET(CMD_802_11_BEACON_CTRL):
-		ret = lbs_ret_802_11_bcn_ctrl(priv, resp);
-		break;
 
 	default:
 		lbs_pr_err("CMD_RESP: unknown cmd response 0x%04x\n",
diff --git a/trunk/drivers/net/wireless/libertas/host.h b/trunk/drivers/net/wireless/libertas/host.h
index 782fd157e5c2..7826f11cf60e 100644
--- a/trunk/drivers/net/wireless/libertas/host.h
+++ b/trunk/drivers/net/wireless/libertas/host.h
@@ -595,6 +595,8 @@ struct cmd_ds_802_11_radio_control {
 } __packed;
 
 struct cmd_ds_802_11_beacon_control {
+	struct cmd_header hdr;
+
 	__le16 action;
 	__le16 beacon_enable;
 	__le16 beacon_period;
@@ -972,7 +974,6 @@ struct cmd_ds_command {
 
 		struct cmd_ds_bt_access bt;
 		struct cmd_ds_fwt_access fwt;
-		struct cmd_ds_802_11_beacon_control bcn_ctrl;
 	} params;
 } __packed;
 #endif