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

net: apple: 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 648c361a
...@@ -154,7 +154,7 @@ static irqreturn_t bmac_txdma_intr(int irq, void *dev_id); ...@@ -154,7 +154,7 @@ static irqreturn_t bmac_txdma_intr(int irq, void *dev_id);
static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id); static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id);
static void bmac_set_timeout(struct net_device *dev); static void bmac_set_timeout(struct net_device *dev);
static void bmac_tx_timeout(struct timer_list *t); static void bmac_tx_timeout(struct timer_list *t);
static int bmac_output(struct sk_buff *skb, struct net_device *dev); static netdev_tx_t bmac_output(struct sk_buff *skb, struct net_device *dev);
static void bmac_start(struct net_device *dev); static void bmac_start(struct net_device *dev);
#define DBDMA_SET(x) ( ((x) | (x) << 16) ) #define DBDMA_SET(x) ( ((x) | (x) << 16) )
...@@ -1456,7 +1456,7 @@ bmac_start(struct net_device *dev) ...@@ -1456,7 +1456,7 @@ bmac_start(struct net_device *dev)
spin_unlock_irqrestore(&bp->lock, flags); spin_unlock_irqrestore(&bp->lock, flags);
} }
static int static netdev_tx_t
bmac_output(struct sk_buff *skb, struct net_device *dev) bmac_output(struct sk_buff *skb, struct net_device *dev)
{ {
struct bmac_data *bp = netdev_priv(dev); struct bmac_data *bp = netdev_priv(dev);
......
...@@ -78,7 +78,7 @@ struct mace_data { ...@@ -78,7 +78,7 @@ struct mace_data {
static int mace_open(struct net_device *dev); static int mace_open(struct net_device *dev);
static int mace_close(struct net_device *dev); static int mace_close(struct net_device *dev);
static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev); static netdev_tx_t mace_xmit_start(struct sk_buff *skb, struct net_device *dev);
static void mace_set_multicast(struct net_device *dev); static void mace_set_multicast(struct net_device *dev);
static void mace_reset(struct net_device *dev); static void mace_reset(struct net_device *dev);
static int mace_set_address(struct net_device *dev, void *addr); static int mace_set_address(struct net_device *dev, void *addr);
...@@ -525,7 +525,7 @@ static inline void mace_set_timeout(struct net_device *dev) ...@@ -525,7 +525,7 @@ static inline void mace_set_timeout(struct net_device *dev)
mp->timeout_active = 1; mp->timeout_active = 1;
} }
static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t mace_xmit_start(struct sk_buff *skb, struct net_device *dev)
{ {
struct mace_data *mp = netdev_priv(dev); struct mace_data *mp = netdev_priv(dev);
volatile struct dbdma_regs __iomem *td = mp->tx_dma; volatile struct dbdma_regs __iomem *td = mp->tx_dma;
......
...@@ -89,7 +89,7 @@ struct mace_frame { ...@@ -89,7 +89,7 @@ struct mace_frame {
static int mace_open(struct net_device *dev); static int mace_open(struct net_device *dev);
static int mace_close(struct net_device *dev); static int mace_close(struct net_device *dev);
static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev); static netdev_tx_t mace_xmit_start(struct sk_buff *skb, struct net_device *dev);
static void mace_set_multicast(struct net_device *dev); static void mace_set_multicast(struct net_device *dev);
static int mace_set_address(struct net_device *dev, void *addr); static int mace_set_address(struct net_device *dev, void *addr);
static void mace_reset(struct net_device *dev); static void mace_reset(struct net_device *dev);
...@@ -444,7 +444,7 @@ static int mace_close(struct net_device *dev) ...@@ -444,7 +444,7 @@ static int mace_close(struct net_device *dev)
* Transmit a frame * Transmit a frame
*/ */
static int mace_xmit_start(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t mace_xmit_start(struct sk_buff *skb, struct net_device *dev)
{ {
struct mace_data *mp = netdev_priv(dev); struct mace_data *mp = 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