提交 c6ecd475 编写于 作者: L Luc Van Oostenryck 提交者: David S. Miller

cail,hsi: fix cfhsi_xmit()'s return type

The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
which is a typedef for an enum type, but the implementation in this
driver returns an 'int'.

Fix this by returning 'netdev_tx_t' in this driver too and
returning NETDEV_TX_OK instead of 0 accordingly.
Signed-off-by: NLuc Van Oostenryck <luc.vanoostenryck@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 fe80536a
...@@ -1006,7 +1006,7 @@ static void cfhsi_aggregation_tout(struct timer_list *t) ...@@ -1006,7 +1006,7 @@ static void cfhsi_aggregation_tout(struct timer_list *t)
cfhsi_start_tx(cfhsi); cfhsi_start_tx(cfhsi);
} }
static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t cfhsi_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct cfhsi *cfhsi = NULL; struct cfhsi *cfhsi = NULL;
int start_xfer = 0; int start_xfer = 0;
...@@ -1072,7 +1072,7 @@ static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -1072,7 +1072,7 @@ static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev)
spin_unlock_bh(&cfhsi->lock); spin_unlock_bh(&cfhsi->lock);
if (aggregate_ready) if (aggregate_ready)
cfhsi_start_tx(cfhsi); cfhsi_start_tx(cfhsi);
return 0; return NETDEV_TX_OK;
} }
/* Delete inactivity timer if started. */ /* Delete inactivity timer if started. */
...@@ -1102,7 +1102,7 @@ static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -1102,7 +1102,7 @@ static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev)
queue_work(cfhsi->wq, &cfhsi->wake_up_work); queue_work(cfhsi->wq, &cfhsi->wake_up_work);
} }
return 0; return NETDEV_TX_OK;
} }
static const struct net_device_ops cfhsi_netdevops; static const struct net_device_ops cfhsi_netdevops;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册