diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2011-05-27 01:31:37 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-06-25 03:04:32 -0400 |
commit | 7d4987de752a94772ad1ae85ad5c702bbcf73305 (patch) | |
tree | 136cd312e7d2582fc98e46d8be5b7f585ec0ee61 /drivers/net/ixgbe/ixgbe.h | |
parent | a65151ba201fe56ac146767e018674a84bfef1a6 (diff) |
ixgbe: Convert IXGBE_DESC_UNUSED from macro to static inline function
This change is a minor cleanup that converts the IXGBE_DESC_UNUSED macro
into a static inline function just for the case of the code being a bit
cleaner.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe.h')
-rw-r--r-- | drivers/net/ixgbe/ixgbe.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h index d6bfb2f6ba86..b1d4b02606ae 100644 --- a/drivers/net/ixgbe/ixgbe.h +++ b/drivers/net/ixgbe/ixgbe.h | |||
@@ -306,9 +306,13 @@ struct ixgbe_q_vector { | |||
306 | ((_eitr) ? (1000000000 / ((_eitr) * 256)) : 8) | 306 | ((_eitr) ? (1000000000 / ((_eitr) * 256)) : 8) |
307 | #define EITR_REG_TO_INTS_PER_SEC EITR_INTS_PER_SEC_TO_REG | 307 | #define EITR_REG_TO_INTS_PER_SEC EITR_INTS_PER_SEC_TO_REG |
308 | 308 | ||
309 | #define IXGBE_DESC_UNUSED(R) \ | 309 | static inline u16 ixgbe_desc_unused(struct ixgbe_ring *ring) |
310 | ((((R)->next_to_clean > (R)->next_to_use) ? 0 : (R)->count) + \ | 310 | { |
311 | (R)->next_to_clean - (R)->next_to_use - 1) | 311 | u16 ntc = ring->next_to_clean; |
312 | u16 ntu = ring->next_to_use; | ||
313 | |||
314 | return ((ntc > ntu) ? 0 : ring->count) + ntc - ntu - 1; | ||
315 | } | ||
312 | 316 | ||
313 | #define IXGBE_RX_DESC_ADV(R, i) \ | 317 | #define IXGBE_RX_DESC_ADV(R, i) \ |
314 | (&(((union ixgbe_adv_rx_desc *)((R)->desc))[i])) | 318 | (&(((union ixgbe_adv_rx_desc *)((R)->desc))[i])) |