aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-4965.c
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2008-01-14 20:46:25 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:10:03 -0500
commit8a1b02452862dd30980ad0ef493eed687bc81474 (patch)
treee4be8fd1dc67b6af1370c0a8dc9e640d0d72a7ae /drivers/net/wireless/iwlwifi/iwl-4965.c
parente7a2827cbbdb11717877c44cbbdf0fb1d14e890c (diff)
iwlwifi: style fixes to usage of << and >> operators
The << and >> operators need space on each side. Cc: Stefano Brivio <stefano.brivio@polimi.it> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Acked-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 5fcc2a6f5bf4..04db34ba814b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -815,11 +815,11 @@ static int iwl4965_sens_energy_cck(struct iwl4965_priv *priv,
815 * This is background noise, which may include transmissions from other 815 * This is background noise, which may include transmissions from other
816 * networks, measured during silence before our network's beacon */ 816 * networks, measured during silence before our network's beacon */
817 silence_rssi_a = (u8)((rx_info->beacon_silence_rssi_a & 817 silence_rssi_a = (u8)((rx_info->beacon_silence_rssi_a &
818 ALL_BAND_FILTER)>>8); 818 ALL_BAND_FILTER) >> 8);
819 silence_rssi_b = (u8)((rx_info->beacon_silence_rssi_b & 819 silence_rssi_b = (u8)((rx_info->beacon_silence_rssi_b &
820 ALL_BAND_FILTER)>>8); 820 ALL_BAND_FILTER) >> 8);
821 silence_rssi_c = (u8)((rx_info->beacon_silence_rssi_c & 821 silence_rssi_c = (u8)((rx_info->beacon_silence_rssi_c &
822 ALL_BAND_FILTER)>>8); 822 ALL_BAND_FILTER) >> 8);
823 823
824 val = max(silence_rssi_b, silence_rssi_c); 824 val = max(silence_rssi_b, silence_rssi_c);
825 max_silence_rssi = max(silence_rssi_a, (u8) val); 825 max_silence_rssi = max(silence_rssi_a, (u8) val);
@@ -4233,14 +4233,14 @@ static int iwl4965_tx_status_reply_compressed_ba(struct iwl4965_priv *priv,
4233 IWL_DEBUG_TX_REPLY("BA %d %d\n", agg->start_idx, ba_resp->ba_seq_ctl); 4233 IWL_DEBUG_TX_REPLY("BA %d %d\n", agg->start_idx, ba_resp->ba_seq_ctl);
4234 4234
4235 /* Calculate shift to align block-ack bits with our Tx window bits */ 4235 /* Calculate shift to align block-ack bits with our Tx window bits */
4236 sh = agg->start_idx - SEQ_TO_INDEX(ba_seq_ctl>>4); 4236 sh = agg->start_idx - SEQ_TO_INDEX(ba_seq_ctl >> 4);
4237 if (sh < 0) /* tbw something is wrong with indices */ 4237 if (sh < 0) /* tbw something is wrong with indices */
4238 sh += 0x100; 4238 sh += 0x100;
4239 4239
4240 /* don't use 64-bit values for now */ 4240 /* don't use 64-bit values for now */
4241 bitmap0 = resp_bitmap0 >> sh; 4241 bitmap0 = resp_bitmap0 >> sh;
4242 bitmap1 = resp_bitmap1 >> sh; 4242 bitmap1 = resp_bitmap1 >> sh;
4243 bitmap0 |= (resp_bitmap1 & ((1<<sh)|((1<<sh)-1))) << (32 - sh); 4243 bitmap0 |= (resp_bitmap1 & ((1 << sh) | ((1 << sh) - 1))) << (32 - sh);
4244 4244
4245 if (agg->frame_count > (64 - sh)) { 4245 if (agg->frame_count > (64 - sh)) {
4246 IWL_DEBUG_TX_REPLY("more frames than bitmap size"); 4246 IWL_DEBUG_TX_REPLY("more frames than bitmap size");
@@ -4425,7 +4425,7 @@ static int iwl4965_tx_queue_agg_enable(struct iwl4965_priv *priv, int txq_id,
4425 iwl4965_tx_queue_set_q2ratid(priv, ra_tid, txq_id); 4425 iwl4965_tx_queue_set_q2ratid(priv, ra_tid, txq_id);
4426 4426
4427 /* Set this queue as a chain-building queue */ 4427 /* Set this queue as a chain-building queue */
4428 iwl4965_set_bits_prph(priv, KDR_SCD_QUEUECHAIN_SEL, (1<<txq_id)); 4428 iwl4965_set_bits_prph(priv, KDR_SCD_QUEUECHAIN_SEL, (1 << txq_id));
4429 4429
4430 /* Place first TFD at index corresponding to start sequence number. 4430 /* Place first TFD at index corresponding to start sequence number.
4431 * Assumes that ssn_idx is valid (!= 0xFFF) */ 4431 * Assumes that ssn_idx is valid (!= 0xFFF) */