net/mlx4_en: Remove unused argument in TX datapath function

Remove owner argument, as it is obsolete and unused.
This also saves the overhead of calculating its value in data-path.

Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Reviewed-by: Saeed Mahameed <saeedm@mellanox.com>
Cc: kernel-team@fb.com
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
index 6ffd1849a604dda97e06d24074c9b27512240602..37386abea54c1d97a9ca87643685a2a5fd443018 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
@@ -265,7 +265,7 @@ static void mlx4_en_stamp_wqe(struct mlx4_en_priv *priv,
 
 u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv,
                         struct mlx4_en_tx_ring *ring,
-                        int index, u8 owner, u64 timestamp,
+                        int index, u64 timestamp,
                         int napi_mode)
 {
        struct mlx4_en_tx_info *tx_info = &ring->tx_info[index];
@@ -344,7 +344,7 @@ u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv,
 
 u32 mlx4_en_recycle_tx_desc(struct mlx4_en_priv *priv,
                            struct mlx4_en_tx_ring *ring,
-                           int index, u8 owner, u64 timestamp,
+                           int index, u64 timestamp,
                            int napi_mode)
 {
        struct mlx4_en_tx_info *tx_info = &ring->tx_info[index];
@@ -381,8 +381,7 @@ int mlx4_en_free_tx_buf(struct net_device *dev, struct mlx4_en_tx_ring *ring)
        while (ring->cons != ring->prod) {
                ring->last_nr_txbb = ring->free_tx_desc(priv, ring,
                                                ring->cons & ring->size_mask,
-                                               !!(ring->cons & ring->size), 0,
-                                               0 /* Non-NAPI caller */);
+                                               0, 0 /* Non-NAPI caller */);
                ring->cons += ring->last_nr_txbb;
                cnt++;
        }
@@ -464,8 +463,7 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
                        /* free next descriptor */
                        last_nr_txbb = ring->free_tx_desc(
                                        priv, ring, ring_index,
-                                       !!((ring_cons + txbbs_skipped) &
-                                       ring->size), timestamp, napi_budget);
+                                       timestamp, napi_budget);
 
                        mlx4_en_stamp_wqe(priv, ring, stamp_index,
                                          !!((ring_cons + txbbs_stamp) &

diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index 8c4f63946b14fbec02a1ad3c7bc65eb6e398e5a7..08b2906a98af88194277d63a21c6fb389f99e88e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -276,7 +276,7 @@ struct mlx4_en_tx_ring {
        struct netdev_queue     *tx_queue;
        u32                     (*free_tx_desc)(struct mlx4_en_priv *priv,
                                                struct mlx4_en_tx_ring *ring,
-                                               int index, u8 owner,
+                                               int index,
                                                u64 timestamp, int napi_mode);
        struct mlx4_en_rx_ring  *recycle_ring;
 
@@ -723,11 +723,11 @@ int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget);
 int mlx4_en_poll_tx_cq(struct napi_struct *napi, int budget);
 u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv,
                         struct mlx4_en_tx_ring *ring,
-                        int index, u8 owner, u64 timestamp,
+                        int index, u64 timestamp,
                         int napi_mode);
 u32 mlx4_en_recycle_tx_desc(struct mlx4_en_priv *priv,
                            struct mlx4_en_tx_ring *ring,
-                           int index, u8 owner, u64 timestamp,
+                           int index, u64 timestamp,
                            int napi_mode);
 void mlx4_en_fill_qp_context(struct mlx4_en_priv *priv, int size, int stride,
                int is_tx, int rss, int qpn, int cqn, int user_prio,