Commit 28d304ef authored by YueHaibing's avatar YueHaibing Committed by David S. Miller

net: sgi: fix return type of ndo_start_xmit function

The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
which is a typedef for an enum type, so make sure the implementation in
this driver has returns 'netdev_tx_t' value, and change the function
return type to netdev_tx_t.

Found by coccinelle.
Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f3bf939f
...@@ -99,7 +99,7 @@ struct ioc3_private { ...@@ -99,7 +99,7 @@ struct ioc3_private {
static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
static void ioc3_set_multicast_list(struct net_device *dev); static void ioc3_set_multicast_list(struct net_device *dev);
static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev); static netdev_tx_t ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev);
static void ioc3_timeout(struct net_device *dev); static void ioc3_timeout(struct net_device *dev);
static inline unsigned int ioc3_hash(const unsigned char *addr); static inline unsigned int ioc3_hash(const unsigned char *addr);
static inline void ioc3_stop(struct ioc3_private *ip); static inline void ioc3_stop(struct ioc3_private *ip);
...@@ -1390,7 +1390,7 @@ static struct pci_driver ioc3_driver = { ...@@ -1390,7 +1390,7 @@ static struct pci_driver ioc3_driver = {
.remove = ioc3_remove_one, .remove = ioc3_remove_one,
}; };
static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
unsigned long data; unsigned long data;
struct ioc3_private *ip = netdev_priv(dev); struct ioc3_private *ip = netdev_priv(dev);
......
...@@ -697,7 +697,7 @@ static void meth_add_to_tx_ring(struct meth_private *priv, struct sk_buff *skb) ...@@ -697,7 +697,7 @@ static void meth_add_to_tx_ring(struct meth_private *priv, struct sk_buff *skb)
/* /*
* Transmit a packet (called by the kernel) * Transmit a packet (called by the kernel)
*/ */
static int meth_tx(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t meth_tx(struct sk_buff *skb, struct net_device *dev)
{ {
struct meth_private *priv = netdev_priv(dev); struct meth_private *priv = netdev_priv(dev);
unsigned long flags; unsigned long flags;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment