diff options
Diffstat (limited to 'drivers/net/82596.c')
-rw-r--r-- | drivers/net/82596.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index 996cc9102215..ea6b139b812c 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
@@ -356,7 +356,7 @@ static char init_setup[] = | |||
356 | 0x7f /* *multi IA */ }; | 356 | 0x7f /* *multi IA */ }; |
357 | 357 | ||
358 | static int i596_open(struct net_device *dev); | 358 | static int i596_open(struct net_device *dev); |
359 | static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev); | 359 | static netdev_tx_t i596_start_xmit(struct sk_buff *skb, struct net_device *dev); |
360 | static irqreturn_t i596_interrupt(int irq, void *dev_id); | 360 | static irqreturn_t i596_interrupt(int irq, void *dev_id); |
361 | static int i596_close(struct net_device *dev); | 361 | static int i596_close(struct net_device *dev); |
362 | static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd); | 362 | static void i596_add_cmd(struct net_device *dev, struct i596_cmd *cmd); |
@@ -1054,8 +1054,7 @@ static void i596_tx_timeout (struct net_device *dev) | |||
1054 | netif_wake_queue (dev); | 1054 | netif_wake_queue (dev); |
1055 | } | 1055 | } |
1056 | 1056 | ||
1057 | 1057 | static netdev_tx_t i596_start_xmit(struct sk_buff *skb, struct net_device *dev) | |
1058 | static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) | ||
1059 | { | 1058 | { |
1060 | struct i596_private *lp = dev->ml_priv; | 1059 | struct i596_private *lp = dev->ml_priv; |
1061 | struct tx_cmd *tx_cmd; | 1060 | struct tx_cmd *tx_cmd; |