diff options
Diffstat (limited to 'drivers/net/mlx4')
-rw-r--r-- | drivers/net/mlx4/en_tx.c | 2 | ||||
-rw-r--r-- | drivers/net/mlx4/mlx4_en.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c index 0ecc1e1b013e..d3d6e991065b 100644 --- a/drivers/net/mlx4/en_tx.c +++ b/drivers/net/mlx4/en_tx.c | |||
@@ -588,7 +588,7 @@ u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb) | |||
588 | return skb_tx_hash(dev, skb); | 588 | return skb_tx_hash(dev, skb); |
589 | } | 589 | } |
590 | 590 | ||
591 | int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) | 591 | netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) |
592 | { | 592 | { |
593 | struct mlx4_en_priv *priv = netdev_priv(dev); | 593 | struct mlx4_en_priv *priv = netdev_priv(dev); |
594 | struct mlx4_en_dev *mdev = priv->mdev; | 594 | struct mlx4_en_dev *mdev = priv->mdev; |
diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h index 4513fb4960dc..4376147b0ea0 100644 --- a/drivers/net/mlx4/mlx4_en.h +++ b/drivers/net/mlx4/mlx4_en.h | |||
@@ -518,7 +518,7 @@ int mlx4_en_arm_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq); | |||
518 | void mlx4_en_poll_tx_cq(unsigned long data); | 518 | void mlx4_en_poll_tx_cq(unsigned long data); |
519 | void mlx4_en_tx_irq(struct mlx4_cq *mcq); | 519 | void mlx4_en_tx_irq(struct mlx4_cq *mcq); |
520 | u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb); | 520 | u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb); |
521 | int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev); | 521 | netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev); |
522 | 522 | ||
523 | int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, struct mlx4_en_tx_ring *ring, | 523 | int mlx4_en_create_tx_ring(struct mlx4_en_priv *priv, struct mlx4_en_tx_ring *ring, |
524 | u32 size, u16 stride); | 524 | u32 size, u16 stride); |