← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/net/wireless/iwlwifi/iwl-agn-sta.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/wireless/iwlwifi/iwl-agn-sta.c
1
1
/******************************************************************************
2
2
 *
3
 
 * Copyright(c) 2003 - 2010 Intel Corporation. All rights reserved.
 
3
 * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
4
4
 *
5
5
 * Portions of this file are derived from the ipw3945 project, as well
6
6
 * as portions of the ieee80211 subsystem header files.
144
144
        size_t cmd_size  = sizeof(struct iwl_wep_cmd);
145
145
        struct iwl_host_cmd cmd = {
146
146
                .id = ctx->wep_key_cmd,
147
 
                .data = wep_cmd,
 
147
                .data = { wep_cmd, },
148
148
                .flags = CMD_SYNC,
149
149
        };
150
150
 
172
172
 
173
173
        cmd_size += sizeof(struct iwl_wep_key) * WEP_KEYS_MAX;
174
174
 
175
 
        cmd.len = cmd_size;
 
175
        cmd.len[0] = cmd_size;
176
176
 
177
177
        if (not_empty || send_if_empty)
178
178
                return iwl_send_cmd(priv, &cmd);
474
474
        memset(&priv->stations[sta_id].keyinfo, 0,
475
475
                                        sizeof(struct iwl_hw_key));
476
476
        memset(&priv->stations[sta_id].sta.key, 0,
477
 
                                        sizeof(struct iwl4965_keyinfo));
 
477
                                        sizeof(struct iwl_keyinfo));
478
478
        priv->stations[sta_id].sta.key.key_flags =
479
479
                        STA_KEY_FLG_NO_ENC | STA_KEY_FLG_INVALID;
480
480
        priv->stations[sta_id].sta.key.key_offset = WEP_INVALID_OFFSET;