diff options
author | Amitkumar Karwar <akarwar@marvell.com> | 2011-05-09 22:00:18 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-10 15:54:55 -0400 |
commit | 7cc5eb629cefa9a40295ff5ee4b1ec41ad855e8d (patch) | |
tree | 6ab4a0df7ac1e4b157791d539ce85f958e663675 /drivers/net/wireless/mwifiex/init.c | |
parent | 8369ae33b705222aa05ab53c7d6b4458f4ed161b (diff) |
mwifiex: remove unnecessary struct mwifiex_opt_sleep_confirm_buffer
The structure definition is
struct mwifiex_opt_sleep_confirm_buffer {
u8 hdr[4];
struct mwifiex_opt_sleep_confirm ps_cfm_sleep;
} __packed;
For sleep_confirm command we already reserve 4 bytes (using skb_reserve())
for an interface header. It will be filled later by interface specific code.
We don't need "hdr[4]" element in above structure. So we can use
"struct mwifiex_opt_sleep_confirm" directly instead of
"struct mwifiex_opt_sleep_confirm_buffer".
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex/init.c')
-rw-r--r-- | drivers/net/wireless/mwifiex/init.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c index 6a8fd9989a2..3f1559e6132 100644 --- a/drivers/net/wireless/mwifiex/init.c +++ b/drivers/net/wireless/mwifiex/init.c | |||
@@ -175,7 +175,7 @@ static int mwifiex_allocate_adapter(struct mwifiex_adapter *adapter) | |||
175 | } | 175 | } |
176 | 176 | ||
177 | adapter->sleep_cfm = | 177 | adapter->sleep_cfm = |
178 | dev_alloc_skb(sizeof(struct mwifiex_opt_sleep_confirm_buffer) | 178 | dev_alloc_skb(sizeof(struct mwifiex_opt_sleep_confirm) |
179 | + INTF_HEADER_LEN); | 179 | + INTF_HEADER_LEN); |
180 | 180 | ||
181 | if (!adapter->sleep_cfm) { | 181 | if (!adapter->sleep_cfm) { |
@@ -197,10 +197,10 @@ static int mwifiex_allocate_adapter(struct mwifiex_adapter *adapter) | |||
197 | */ | 197 | */ |
198 | static void mwifiex_init_adapter(struct mwifiex_adapter *adapter) | 198 | static void mwifiex_init_adapter(struct mwifiex_adapter *adapter) |
199 | { | 199 | { |
200 | struct mwifiex_opt_sleep_confirm_buffer *sleep_cfm_buf = NULL; | 200 | struct mwifiex_opt_sleep_confirm *sleep_cfm_buf = NULL; |
201 | 201 | ||
202 | skb_put(adapter->sleep_cfm, sizeof(sleep_cfm_buf->ps_cfm_sleep)); | 202 | skb_put(adapter->sleep_cfm, sizeof(struct mwifiex_opt_sleep_confirm)); |
203 | sleep_cfm_buf = (struct mwifiex_opt_sleep_confirm_buffer *) | 203 | sleep_cfm_buf = (struct mwifiex_opt_sleep_confirm *) |
204 | (adapter->sleep_cfm->data); | 204 | (adapter->sleep_cfm->data); |
205 | 205 | ||
206 | adapter->cmd_sent = false; | 206 | adapter->cmd_sent = false; |
@@ -268,16 +268,14 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter) | |||
268 | mwifiex_wmm_init(adapter); | 268 | mwifiex_wmm_init(adapter); |
269 | 269 | ||
270 | if (adapter->sleep_cfm) { | 270 | if (adapter->sleep_cfm) { |
271 | memset(&sleep_cfm_buf->ps_cfm_sleep, 0, | 271 | memset(sleep_cfm_buf, 0, adapter->sleep_cfm->len); |
272 | adapter->sleep_cfm->len); | 272 | sleep_cfm_buf->command = |
273 | sleep_cfm_buf->ps_cfm_sleep.command = | 273 | cpu_to_le16(HostCmd_CMD_802_11_PS_MODE_ENH); |
274 | cpu_to_le16(HostCmd_CMD_802_11_PS_MODE_ENH); | 274 | sleep_cfm_buf->size = |
275 | sleep_cfm_buf->ps_cfm_sleep.size = | 275 | cpu_to_le16(adapter->sleep_cfm->len); |
276 | cpu_to_le16(adapter->sleep_cfm->len); | 276 | sleep_cfm_buf->result = 0; |
277 | sleep_cfm_buf->ps_cfm_sleep.result = 0; | 277 | sleep_cfm_buf->action = cpu_to_le16(SLEEP_CONFIRM); |
278 | sleep_cfm_buf->ps_cfm_sleep.action = cpu_to_le16(SLEEP_CONFIRM); | 278 | sleep_cfm_buf->resp_ctrl = cpu_to_le16(RESP_NEEDED); |
279 | sleep_cfm_buf->ps_cfm_sleep.resp_ctrl = | ||
280 | cpu_to_le16(RESP_NEEDED); | ||
281 | } | 279 | } |
282 | memset(&adapter->sleep_params, 0, sizeof(adapter->sleep_params)); | 280 | memset(&adapter->sleep_params, 0, sizeof(adapter->sleep_params)); |
283 | memset(&adapter->sleep_period, 0, sizeof(adapter->sleep_period)); | 281 | memset(&adapter->sleep_period, 0, sizeof(adapter->sleep_period)); |