Commit 5dad61b8 authored Oct 11, 2017 by Tariq Toukan Committed by David S. Miller Oct 11, 2017

net/mlx4_en: Replace netdev parameter with priv in XDP xmit function



The struct net_device parameter was passed only to extract
struct mlx4_en_priv out of it.
Here we pass the priv parameter directly.

Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 14c68c43

drivers/net/ethernet/mellanox/mlx4/en_rx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -778,7 +778,7 @@ int mlx4_en_process_rx_cq(struct net_device dev, struct mlx4_en_cq cq, int bud
		case XDP_PASS:
		break;
		case XDP_TX:
		if (likely(!mlx4_en_xmit_frame(ring, frags, dev,
		if (likely(!mlx4_en_xmit_frame(ring, frags, priv,
		length, cq_ring,
		&doorbell_pending))) {
		frags[0].page = NULL;

drivers/net/ethernet/mellanox/mlx4/en_tx.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1087,10 +1087,9 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff skb, struct net_device dev)

		netdev_tx_t mlx4_en_xmit_frame(struct mlx4_en_rx_ring *rx_ring,
		struct mlx4_en_rx_alloc *frame,
		struct net_device *dev, unsigned int length,
		struct mlx4_en_priv *priv, unsigned int length,
		int tx_ind, bool *doorbell_pending)
		{
		struct mlx4_en_priv *priv = netdev_priv(dev);
		union mlx4_wqe_qpn_vlan qpn_vlan = {};
		struct mlx4_en_tx_desc *tx_desc;
		struct mlx4_en_tx_info *tx_info;

drivers/net/ethernet/mellanox/mlx4/mlx4_en.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -693,7 +693,7 @@ u16 mlx4_en_select_queue(struct net_device dev, struct sk_buff skb,
		netdev_tx_t mlx4_en_xmit(struct sk_buff skb, struct net_device dev);
		netdev_tx_t mlx4_en_xmit_frame(struct mlx4_en_rx_ring *rx_ring,
		struct mlx4_en_rx_alloc *frame,
		struct net_device *dev, unsigned int length,
		struct mlx4_en_priv *priv, unsigned int length,
		int tx_ind, bool *doorbell_pending);
		void mlx4_en_xmit_doorbell(struct mlx4_en_tx_ring *ring);
		bool mlx4_en_rx_recycle(struct mlx4_en_rx_ring *ring,