diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-13 01:58:04 -0400 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-21 03:26:46 -0400 |
commit | 4b8265ab4d701989bc70371ecc4347c9debc1a03 (patch) | |
tree | 744c69beaf08431a37cdce3a704a3c5741f99410 /drivers/net/wireless | |
parent | ae7486a2b734ee039bec94427c25317c589f1664 (diff) |
iwlwifi: mvm: use C99 initializers for add_sta
Instead of code the fixed values, use a C99 initializer.
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/sta.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.c b/drivers/net/wireless/iwlwifi/mvm/sta.c index 812813964847..54459345c967 100644 --- a/drivers/net/wireless/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/iwlwifi/mvm/sta.c | |||
@@ -98,23 +98,21 @@ int iwl_mvm_sta_send_to_fw(struct iwl_mvm *mvm, struct ieee80211_sta *sta, | |||
98 | bool update) | 98 | bool update) |
99 | { | 99 | { |
100 | struct iwl_mvm_sta *mvm_sta = (void *)sta->drv_priv; | 100 | struct iwl_mvm_sta *mvm_sta = (void *)sta->drv_priv; |
101 | struct iwl_mvm_add_sta_cmd add_sta_cmd; | 101 | struct iwl_mvm_add_sta_cmd add_sta_cmd = { |
102 | .sta_id = mvm_sta->sta_id, | ||
103 | .mac_id_n_color = cpu_to_le32(mvm_sta->mac_id_n_color), | ||
104 | .add_modify = update ? 1 : 0, | ||
105 | .station_flags_msk = cpu_to_le32(STA_FLG_FAT_EN_MSK | | ||
106 | STA_FLG_MIMO_EN_MSK), | ||
107 | }; | ||
102 | int ret; | 108 | int ret; |
103 | u32 status; | 109 | u32 status; |
104 | u32 agg_size = 0, mpdu_dens = 0; | 110 | u32 agg_size = 0, mpdu_dens = 0; |
105 | 111 | ||
106 | memset(&add_sta_cmd, 0, sizeof(add_sta_cmd)); | ||
107 | |||
108 | add_sta_cmd.sta_id = mvm_sta->sta_id; | ||
109 | add_sta_cmd.mac_id_n_color = cpu_to_le32(mvm_sta->mac_id_n_color); | ||
110 | if (!update) { | 112 | if (!update) { |
111 | add_sta_cmd.tfd_queue_msk = cpu_to_le32(mvm_sta->tfd_queue_msk); | 113 | add_sta_cmd.tfd_queue_msk = cpu_to_le32(mvm_sta->tfd_queue_msk); |
112 | memcpy(&add_sta_cmd.addr, sta->addr, ETH_ALEN); | 114 | memcpy(&add_sta_cmd.addr, sta->addr, ETH_ALEN); |
113 | } | 115 | } |
114 | add_sta_cmd.add_modify = update ? 1 : 0; | ||
115 | |||
116 | add_sta_cmd.station_flags_msk |= cpu_to_le32(STA_FLG_FAT_EN_MSK | | ||
117 | STA_FLG_MIMO_EN_MSK); | ||
118 | 116 | ||
119 | switch (sta->bandwidth) { | 117 | switch (sta->bandwidth) { |
120 | case IEEE80211_STA_RX_BW_160: | 118 | case IEEE80211_STA_RX_BW_160: |