diff options
Diffstat (limited to 'drivers/net/tehuti.c')
-rw-r--r-- | drivers/net/tehuti.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index 3c2679cd196b..ec9dfb251f30 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/tehuti.c | |||
@@ -1622,7 +1622,8 @@ static inline int bdx_tx_space(struct bdx_priv *priv) | |||
1622 | * the driver. Note: the driver must NOT put the skb in its DMA ring. | 1622 | * the driver. Note: the driver must NOT put the skb in its DMA ring. |
1623 | * o NETDEV_TX_LOCKED Locking failed, please retry quickly. | 1623 | * o NETDEV_TX_LOCKED Locking failed, please retry quickly. |
1624 | */ | 1624 | */ |
1625 | static int bdx_tx_transmit(struct sk_buff *skb, struct net_device *ndev) | 1625 | static netdev_tx_t bdx_tx_transmit(struct sk_buff *skb, |
1626 | struct net_device *ndev) | ||
1626 | { | 1627 | { |
1627 | struct bdx_priv *priv = netdev_priv(ndev); | 1628 | struct bdx_priv *priv = netdev_priv(ndev); |
1628 | struct txd_fifo *f = &priv->txd_fifo0; | 1629 | struct txd_fifo *f = &priv->txd_fifo0; |
@@ -2427,7 +2428,7 @@ static void bdx_get_ethtool_stats(struct net_device *netdev, | |||
2427 | */ | 2428 | */ |
2428 | static void bdx_ethtool_ops(struct net_device *netdev) | 2429 | static void bdx_ethtool_ops(struct net_device *netdev) |
2429 | { | 2430 | { |
2430 | static struct ethtool_ops bdx_ethtool_ops = { | 2431 | static const struct ethtool_ops bdx_ethtool_ops = { |
2431 | .get_settings = bdx_get_settings, | 2432 | .get_settings = bdx_get_settings, |
2432 | .get_drvinfo = bdx_get_drvinfo, | 2433 | .get_drvinfo = bdx_get_drvinfo, |
2433 | .get_link = ethtool_op_get_link, | 2434 | .get_link = ethtool_op_get_link, |