diff options
author | Nelson, Shannon <shannon.nelson@intel.com> | 2009-05-07 06:40:15 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-07 17:52:32 -0400 |
commit | c9c7d2e5a06cd3a26b6be096949e3371ec2aa123 (patch) | |
tree | 2725ad48a4a15e106a56b9ece4724180fd1db6b9 /drivers/net | |
parent | bf069c9726b592432ed646e72b910ac3c098d025 (diff) |
ixgbe: Typecase '1' for 64 bit shift
Make sure we don't get any sign-extend issues when we shift a 1
into bit 31.
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 4a316e9c054..efb175b1e43 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -1307,7 +1307,7 @@ static inline void map_vector_to_rxq(struct ixgbe_adapter *a, int v_idx, | |||
1307 | 1307 | ||
1308 | set_bit(r_idx, q_vector->rxr_idx); | 1308 | set_bit(r_idx, q_vector->rxr_idx); |
1309 | q_vector->rxr_count++; | 1309 | q_vector->rxr_count++; |
1310 | a->rx_ring[r_idx].v_idx = 1 << v_idx; | 1310 | a->rx_ring[r_idx].v_idx = (u64)1 << v_idx; |
1311 | } | 1311 | } |
1312 | 1312 | ||
1313 | static inline void map_vector_to_txq(struct ixgbe_adapter *a, int v_idx, | 1313 | static inline void map_vector_to_txq(struct ixgbe_adapter *a, int v_idx, |
@@ -1317,7 +1317,7 @@ static inline void map_vector_to_txq(struct ixgbe_adapter *a, int v_idx, | |||
1317 | 1317 | ||
1318 | set_bit(t_idx, q_vector->txr_idx); | 1318 | set_bit(t_idx, q_vector->txr_idx); |
1319 | q_vector->txr_count++; | 1319 | q_vector->txr_count++; |
1320 | a->tx_ring[t_idx].v_idx = 1 << v_idx; | 1320 | a->tx_ring[t_idx].v_idx = (u64)1 << v_idx; |
1321 | } | 1321 | } |
1322 | 1322 | ||
1323 | /** | 1323 | /** |
@@ -4057,7 +4057,7 @@ static void ixgbe_watchdog(unsigned long data) | |||
4057 | int i; | 4057 | int i; |
4058 | 4058 | ||
4059 | for (i = 0; i < adapter->num_msix_vectors - NON_Q_VECTORS; i++) | 4059 | for (i = 0; i < adapter->num_msix_vectors - NON_Q_VECTORS; i++) |
4060 | eics |= (1 << i); | 4060 | eics |= ((u64)1 << i); |
4061 | 4061 | ||
4062 | /* Cause software interrupt to ensure rx rings are cleaned */ | 4062 | /* Cause software interrupt to ensure rx rings are cleaned */ |
4063 | switch (hw->mac.type) { | 4063 | switch (hw->mac.type) { |