|
@@ -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)
|
|
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);
|