Merge branch 'for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[linux-beck.git] / drivers / staging / octeon / ethernet-tx.c

diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index ffe9bd77a7bbf841a5d299b9643d3bae50a2f214..6b4c20872323136ea5a69f6cc8eb98b9361edb8d 100644 (file)
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/drivers/staging/octeon/ethernet-tx.c
@@ -58,9 +58,9 @@ static DECLARE_TASKLET(cvm_oct_tx_cleanup_tasklet, cvm_oct_tx_do_cleanup, 0);
 /* Maximum number of SKBs to try to free per xmit packet. */
 #define MAX_SKB_TO_FREE (MAX_OUT_QUEUE_DEPTH * 2)
 
-static inline int32_t cvm_oct_adjust_skb_to_free(int32_t skb_to_free, int fau)
+static inline int cvm_oct_adjust_skb_to_free(int skb_to_free, int fau)
 {
-       int32_t undo;
+       int undo;
 
        undo = skb_to_free > 0 ? MAX_SKB_TO_FREE : skb_to_free +
                                                   MAX_SKB_TO_FREE;
@@ -83,7 +83,7 @@ static void cvm_oct_kick_tx_poll_watchdog(void)
 
 static void cvm_oct_free_tx_skbs(struct net_device *dev)
 {
-       int32_t skb_to_free;
+       int skb_to_free;
        int qos, queues_per_port;
        int total_freed = 0;
        int total_remaining = 0;
@@ -148,8 +148,8 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
        enum {QUEUE_CORE, QUEUE_HW, QUEUE_DROP} queue_type;
        struct octeon_ethernet *priv = netdev_priv(dev);
        struct sk_buff *to_free_list;
-       int32_t skb_to_free;
-       int32_t buffers_to_free;
+       int skb_to_free;
+       int buffers_to_free;
        u32 total_to_clean;
        unsigned long flags;
 #if REUSE_SKBUFFS_WITHOUT_FREE
@@ -220,7 +220,8 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
                                        priv->fau + qos * 4, MAX_SKB_TO_FREE);
                        }
                        skb_to_free = cvm_oct_adjust_skb_to_free(skb_to_free,
-                                                       priv->fau + qos * 4);
+                                                                priv->fau +
+                                                                qos * 4);
                        spin_lock_irqsave(&priv->tx_free_list[qos].lock, flags);
                        goto skip_xmit;
                }
@@ -402,7 +403,7 @@ dont_put_skbuff_in_hw:
        }
 
        skb_to_free = cvm_oct_adjust_skb_to_free(skb_to_free,
-                                               priv->fau + qos * 4);
+                                                priv->fau + qos * 4);
 
        /*
         * If we're sending faster than the receive can free them then