ixgbe: Move all values that deal with count, next_to_use, next_to_clean to u16

This change updates all values dealing with count, next_to_use, and
next_to_clean so that they stay u16 values.  The advantage of this is that
there is no re-casting of type during the propagation through the stack.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 63544e9c0055316d0397cb671f2ff99d85c77293)

Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index b87fd91b4937720208618951b7753c190855cfde..7ec9ca88b81b1ed4118be785c09a081eabdbc985 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -6593,11 +6593,12 @@ static int ixgbe_tx_map(struct ixgbe_adapter *adapter,
        struct ixgbe_tx_buffer *tx_buffer_info;
        unsigned int len;
        unsigned int total = skb->len;
-       unsigned int offset = 0, size, count = 0, i;
+       unsigned int offset = 0, size, count = 0;
        unsigned int nr_frags = skb_shinfo(skb)->nr_frags;
        unsigned int f;
        unsigned int bytecount = skb->len;
        u16 gso_segs = 1;
+       u16 i;
 
        i = tx_ring->next_to_use;
 
@@ -6863,7 +6864,7 @@ static void ixgbe_atr(struct ixgbe_ring *ring, struct sk_buff *skb,
                                              input, common, ring->queue_index);
 }
 
-static int __ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, int size)
+static int __ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, u16 size)
 {
        netif_stop_subqueue(tx_ring->netdev, tx_ring->queue_index);
        /* Herbert's original patch had:
@@ -6882,7 +6883,7 @@ static int __ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, int size)
        return 0;
 }
 
-static int ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, int size)
+static int ixgbe_maybe_stop_tx(struct ixgbe_ring *tx_ring, u16 size)
 {
        if (likely(ixgbe_desc_unused(tx_ring) >= size))
                return 0;
@@ -6920,13 +6921,13 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb,
                          struct ixgbe_adapter *adapter,
                          struct ixgbe_ring *tx_ring)
 {
-       unsigned int first;
        unsigned int tx_flags = 0;
-       u8 hdr_len = 0;
        int tso;
-       int count = 0;
+       u16 count = 0;
+       u16 first;
        unsigned int f;
        __be16 protocol;
+       u8 hdr_len = 0;
 
        protocol = vlan_get_protocol(skb);