libertas: remove SLEEP_PERIOD command support code (not implemented
in fw)
Marcelo Tosatti
mtosatti at redhat.unroutablecom
Tue Jan 2 10:59:19 EST 2007
Commit: 148ae53385465c68c41d5af48400cbe57d52f4bb
Parent: 8c49d8bad34c1b0f0be08f813bfe75daecaedcfc
commit 148ae53385465c68c41d5af48400cbe57d52f4bb
Author: Marcelo Tosatti <mtosatti at redhat.com>
AuthorDate: Sun Dec 24 15:50:28 2006 -0200
Commit: Andres Salomon <dilinger at debian.org>
CommitDate: Tue Jan 2 10:33:06 2007 -0500
libertas: remove SLEEP_PERIOD command support code (not implemented in fw)
Subject says it all.
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
(cherry picked from b0524b017372f9a3c196ec9102d8029486d65417 commit)
---
drivers/net/wireless/libertas/host.h | 4 --
drivers/net/wireless/libertas/hostcmd.h | 10 -----
drivers/net/wireless/libertas/wlan_cmd.c | 28 -------------
drivers/net/wireless/libertas/wlan_cmdresp.c | 25 ------------
drivers/net/wireless/libertas/wlan_dev.h | 9 ----
drivers/net/wireless/libertas/wlan_ioctl.c | 55 --------------------------
drivers/net/wireless/libertas/wlan_tx.c | 27 -------------
drivers/net/wireless/libertas/wlan_wext.c | 6 ---
drivers/net/wireless/libertas/wlan_wext.h | 1
9 files changed, 1 insertions(+), 164 deletions(-)
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index e462432..9c0fa9c 100644
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@ -156,8 +156,6 @@ #define HostCmd_CMD_802_11_SLEEP_PARAMS
#define HostCmd_CMD_802_11_INACTIVITY_TIMEOUT 0x0067
-#define HostCmd_CMD_802_11_SLEEP_PERIOD 0x0068
-
#define HostCmd_CMD_802_11_TPC_CFG 0x0072
#define HostCmd_CMD_802_11_PWR_CFG 0x0073
@@ -255,8 +253,6 @@ #define HostCmd_RET_802_11_SLEEP_PARAMS
#define HostCmd_RET_802_11_INACTIVITY_TIMEOUT 0x8067
-#define HostCmd_RET_802_11_SLEEP_PERIOD 0x8068
-
#define HostCmd_RET_802_11D_DOMAIN_INFO (0x8000 | \
HostCmd_CMD_802_11D_DOMAIN_INFO)
diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h
index a334b75..a7b71fc 100644
--- a/drivers/net/wireless/libertas/hostcmd.h
+++ b/drivers/net/wireless/libertas/hostcmd.h
@@ -487,15 +487,6 @@ struct HostCmd_DS_802_11_SLEEP_PARAMS {
u16 Reserved;
};
-/* HostCmd_DS_802_11_SLEEP_PERIOD */
-struct HostCmd_DS_802_11_SLEEP_PERIOD {
- /* ACT_GET/ACT_SET */
- u16 Action;
-
- /* Sleep Period in msec */
- u16 Period;
-};
-
/* HostCmd_DS_802_11_INACTIVITY_TIMEOUT */
struct HostCmd_DS_802_11_INACTIVITY_TIMEOUT {
/* ACT_GET/ACT_SET */
@@ -846,7 +837,6 @@ struct HostCmd_DS_COMMAND {
struct HostCmd_DS_802_11_SLEEP_PARAMS sleep_params;
struct HostCmd_DS_802_11_INACTIVITY_TIMEOUT inactivity_timeout;
- struct HostCmd_DS_802_11_SLEEP_PERIOD ps_sleeppd;
struct HostCmd_DS_802_11_TPC_CFG tpccfg;
struct HostCmd_DS_802_11_PWR_CFG pwrcfg;
struct HostCmd_DS_802_11_AFC afc;
diff --git a/drivers/net/wireless/libertas/wlan_cmd.c b/drivers/net/wireless/libertas/wlan_cmd.c
index 88ecca3..00165a7 100644
--- a/drivers/net/wireless/libertas/wlan_cmd.c
+++ b/drivers/net/wireless/libertas/wlan_cmd.c
@@ -182,29 +182,6 @@ static int wlan_cmd_802_11_inactivity_ti
}
/**
- * @brief This function prepares command of sleep_period.
- *
- * @param priv A pointer to wlan_private structure
- * @param cmd A pointer to HostCmd_DS_COMMAND structure
- * @param cmd_action the action: GET or SET
- * @param pdata_buf A pointer to data buffer
- * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE
- */
-static int wlan_cmd_802_11_sleep_period(wlan_private * priv,
- struct HostCmd_DS_COMMAND *cmd,
- u16 cmd_action, void *pdata_buf)
-{
- cmd->Command = cpu_to_le16(HostCmd_CMD_802_11_SLEEP_PERIOD);
- cmd->Size =
- cpu_to_le16(sizeof(struct HostCmd_DS_802_11_SLEEP_PERIOD) +
- S_DS_GEN);
- memmove(&cmd->params.ps_sleeppd, pdata_buf,
- sizeof(struct HostCmd_DS_802_11_SLEEP_PERIOD));
-
- return WLAN_STATUS_SUCCESS;
-}
-
-/**
* @brief This function prepares command of sleep_params.
*
* @param priv A pointer to wlan_private structure
@@ -1701,11 +1678,6 @@ #define ACTION_NUMLED_TLVTYPE_LEN_FIELDS
ret = WLAN_STATUS_SUCCESS;
break;
- case HostCmd_CMD_802_11_SLEEP_PERIOD:
- ret = wlan_cmd_802_11_sleep_period(priv, CmdPtr,
- cmd_action, pdata_buf);
- break;
-
case HostCmd_CMD_BT_ACCESS:
ret = wlan_cmd_bt_access(priv, CmdPtr, cmd_action, pdata_buf);
break;
diff --git a/drivers/net/wireless/libertas/wlan_cmdresp.c b/drivers/net/wireless/libertas/wlan_cmdresp.c
index 9fe1858..164446b 100644
--- a/drivers/net/wireless/libertas/wlan_cmdresp.c
+++ b/drivers/net/wireless/libertas/wlan_cmdresp.c
@@ -352,28 +352,6 @@ static int wlan_ret_802_11_sleep_params(
}
/**
- * @brief This function handles the command response of sleep_params
- *
- * @param priv A pointer to wlan_private structure
- * @param resp A pointer to HostCmd_DS_COMMAND
- * @return WLAN_STATUS_SUCCESS or WLAN_STATUS_FAILURE
- */
-static int wlan_ret_802_11_sleep_period(wlan_private * priv,
- struct HostCmd_DS_COMMAND *resp)
-{
- struct HostCmd_DS_802_11_SLEEP_PERIOD *sp_period =
- &resp->params.ps_sleeppd;
- wlan_adapter *Adapter = priv->adapter;
-
- ENTER();
-
- Adapter->sleep_period.period = le16_to_cpu(sp_period->Period);
-
- LEAVE();
- return WLAN_STATUS_SUCCESS;
-}
-
-/**
* @brief This function handles the command response of mac_control
*
* @param priv A pointer to wlan_private structure
@@ -1116,9 +1094,6 @@ int libertas_process_rx_command(wlan_pri
spin_unlock_irqrestore(&Adapter->driver_lock, flags);
break;
- case HostCmd_RET_802_11_SLEEP_PERIOD:
- ret = wlan_ret_802_11_sleep_period(priv, resp);
- break;
case HostCmd_RET_802_11_TPC_CFG:
spin_lock_irqsave(&Adapter->driver_lock, flags);
memmove(Adapter->CurCmd->pdata_buf,
diff --git a/drivers/net/wireless/libertas/wlan_dev.h b/drivers/net/wireless/libertas/wlan_dev.h
index eee3b86..248abe8 100644
--- a/drivers/net/wireless/libertas/wlan_dev.h
+++ b/drivers/net/wireless/libertas/wlan_dev.h
@@ -116,12 +116,6 @@ struct sleep_params {
u16 sp_reserved;
};
-/** sleep_period */
-struct sleep_period {
- u16 period;
- u16 reserved;
-};
-
/** Data structure for the Marvell WLAN device */
typedef struct _wlan_dev {
/** device name */
@@ -430,9 +424,6 @@ #define MAX_WPA_IE_LEN 64
/** sleep_params */
struct sleep_params sp;
- /** sleep_period (Enhanced Power Save) */
- struct sleep_period sleep_period;
-
/** RF calibration data */
#define MAX_REGION_CHANNEL_NUM 2
diff --git a/drivers/net/wireless/libertas/wlan_ioctl.c b/drivers/net/wireless/libertas/wlan_ioctl.c
index ad868b5..0f30ec7 100644
--- a/drivers/net/wireless/libertas/wlan_ioctl.c
+++ b/drivers/net/wireless/libertas/wlan_ioctl.c
@@ -1042,58 +1042,6 @@ static int wlan_get_tsf_ioctl(wlan_priva
}
/**
- * @brief Get/Set sleep period
- * @param priv A pointer to wlan_private structure
- * @param wrq A pointer to iwreq structure
- * @return WLAN_STATUS_SUCCESS --success, otherwise fail
- */
-static int wlan_sleep_period(wlan_private * priv, struct iwreq *wrq)
-{
- int ret;
- int data;
- wlan_adapter *Adapter = priv->adapter;
- struct HostCmd_DS_802_11_SLEEP_PERIOD sleeppd;
-
- ENTER();
-
- if (wrq->u.data.length > 1)
- return -ENOTSUPP;
-
- memset(&sleeppd, 0, sizeof(sleeppd));
- memset(&Adapter->sleep_period, 0, sizeof(struct sleep_period));
-
- if (wrq->u.data.length == 0) {
- sleeppd.Action = cpu_to_le16(HostCmd_ACT_GEN_GET);
- } else {
- if (copy_from_user(&data, wrq->u.data.pointer, sizeof(int))) {
- dprintk(1, "Copy from user failed\n");
- return -EFAULT;
- }
-
- /* sleep period is between 0 or 10 ... 60 */
- if ((data <= 60 && data >= 10) || (data == 0)) {
- sleeppd.Action = cpu_to_le16(HostCmd_ACT_GEN_SET);
- sleeppd.Period = data;
- } else
- return -EINVAL;
- }
-
- ret = libertas_prepare_and_send_command(priv, HostCmd_CMD_802_11_SLEEP_PERIOD,
- 0, HostCmd_OPTION_WAITFORRSP,
- 0, (void *)&sleeppd);
-
- data = (int)Adapter->sleep_period.period;
- if (copy_to_user(wrq->u.data.pointer, &data, sizeof(int))) {
- dprintk(1, "Copy to user failed\n");
- return -EFAULT;
- }
- wrq->u.data.length = 1;
-
- LEAVE();
- return ret;
-}
-
-/**
* @brief Get/Set adapt rate
* @param priv A pointer to wlan_private structure
* @param wrq A pointer to iwreq structure
@@ -2841,9 +2789,6 @@ #define MAX_U16_VAL 65535
wrq->u.data.length = gpio->Header.Len;
}
break;
- case WLAN_SLEEP_PERIOD:
- ret = wlan_sleep_period(priv, wrq);
- break;
case WLAN_ADAPT_RATESET:
ret = wlan_adapt_rateset(priv, wrq);
break;
diff --git a/drivers/net/wireless/libertas/wlan_tx.c b/drivers/net/wireless/libertas/wlan_tx.c
index 114851d..e9de8ca 100644
--- a/drivers/net/wireless/libertas/wlan_tx.c
+++ b/drivers/net/wireless/libertas/wlan_tx.c
@@ -112,15 +112,7 @@ static int SendSinglePacket(wlan_private
memset(pLocalTxPD, 0, sizeof(struct TxPD));
pLocalTxPD->TxPacketLength = skb->len;
-#if 0
- if (Adapter->PSState != PS_STATE_FULL_POWER) {
- if (libertas_check_last_packet_indication(priv)) {
- Adapter->TxLockFlag = 1;
- pLocalTxPD->PowerMgmt =
- MRVDRV_TxPD_POWER_MGMT_LAST_PACKET;
- }
- }
-#endif
+
/* offset of actual data */
pLocalTxPD->TxPacketLocation = sizeof(struct TxPD);
@@ -321,23 +313,6 @@ done:
#endif
/**
- * @brief This function check if we need send last packet indication.
- *
- * @param priv A pointer to wlan_private structure
- *
- * @return TRUE or FALSE
- */
-u8 libertas_check_last_packet_indication(wlan_private * priv)
-{
- wlan_adapter *Adapter = priv->adapter;
- u8 ret = 0;
- if (Adapter->sleep_period.period == 0)
- goto done;
-done:
- return ret;
-}
-
-/**
* @brief This function sends to the host the last transmitted packet,
* filling the radiotap headers with transmission information.
*
diff --git a/drivers/net/wireless/libertas/wlan_wext.c b/drivers/net/wireless/libertas/wlan_wext.c
index 1e25dcc..67a4bbc 100644
--- a/drivers/net/wireless/libertas/wlan_wext.c
+++ b/drivers/net/wireless/libertas/wlan_wext.c
@@ -1642,16 +1642,10 @@ #endif /* REASSOCIATION */
IW_PRIV_TYPE_INT | 16,
"ledgpio"},
{
- WLAN_SLEEP_PERIOD,
- IW_PRIV_TYPE_INT | 16,
- IW_PRIV_TYPE_INT | 16,
- "sleeppd"},
- {
WLAN_ADAPT_RATESET,
IW_PRIV_TYPE_INT | 16,
IW_PRIV_TYPE_INT | 16,
"rateadapt"},
-
{
WLAN_INACTIVITY_TIMEOUT,
IW_PRIV_TYPE_INT | 16,
diff --git a/drivers/net/wireless/libertas/wlan_wext.h b/drivers/net/wireless/libertas/wlan_wext.h
index fae0dcc..91f3954 100644
--- a/drivers/net/wireless/libertas/wlan_wext.h
+++ b/drivers/net/wireless/libertas/wlan_wext.h
@@ -149,7 +149,6 @@ #define WLAN_AUTO_FREQ_SET 3
#define WLAN_AUTO_FREQ_GET 4
#define WLAN_LED_GPIO_CTRL 5
#define WLAN_SCANPROBES 6
-#define WLAN_SLEEP_PERIOD 7
#define WLAN_ADAPT_RATESET 8
#define WLAN_INACTIVITY_TIMEOUT 9
#define WLANSNR 10
More information about the Commits-kernel
mailing list