diff options
Diffstat (limited to 'drivers/net/hp100.c')
-rw-r--r-- | drivers/net/hp100.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c index d1b63387e9bc..a9a1a99f02dd 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c | |||
@@ -240,9 +240,10 @@ static int hp100_probe1(struct net_device *dev, int ioaddr, u_char bus, | |||
240 | 240 | ||
241 | static int hp100_open(struct net_device *dev); | 241 | static int hp100_open(struct net_device *dev); |
242 | static int hp100_close(struct net_device *dev); | 242 | static int hp100_close(struct net_device *dev); |
243 | static int hp100_start_xmit(struct sk_buff *skb, struct net_device *dev); | 243 | static netdev_tx_t hp100_start_xmit(struct sk_buff *skb, |
244 | static int hp100_start_xmit_bm(struct sk_buff *skb, | 244 | struct net_device *dev); |
245 | struct net_device *dev); | 245 | static netdev_tx_t hp100_start_xmit_bm(struct sk_buff *skb, |
246 | struct net_device *dev); | ||
246 | static void hp100_rx(struct net_device *dev); | 247 | static void hp100_rx(struct net_device *dev); |
247 | static struct net_device_stats *hp100_get_stats(struct net_device *dev); | 248 | static struct net_device_stats *hp100_get_stats(struct net_device *dev); |
248 | static void hp100_misc_interrupt(struct net_device *dev); | 249 | static void hp100_misc_interrupt(struct net_device *dev); |
@@ -1483,7 +1484,8 @@ static int hp100_check_lan(struct net_device *dev) | |||
1483 | */ | 1484 | */ |
1484 | 1485 | ||
1485 | /* tx function for busmaster mode */ | 1486 | /* tx function for busmaster mode */ |
1486 | static int hp100_start_xmit_bm(struct sk_buff *skb, struct net_device *dev) | 1487 | static netdev_tx_t hp100_start_xmit_bm(struct sk_buff *skb, |
1488 | struct net_device *dev) | ||
1487 | { | 1489 | { |
1488 | unsigned long flags; | 1490 | unsigned long flags; |
1489 | int i, ok_flag; | 1491 | int i, ok_flag; |
@@ -1635,7 +1637,8 @@ static void hp100_clean_txring(struct net_device *dev) | |||
1635 | } | 1637 | } |
1636 | 1638 | ||
1637 | /* tx function for slave modes */ | 1639 | /* tx function for slave modes */ |
1638 | static int hp100_start_xmit(struct sk_buff *skb, struct net_device *dev) | 1640 | static netdev_tx_t hp100_start_xmit(struct sk_buff *skb, |
1641 | struct net_device *dev) | ||
1639 | { | 1642 | { |
1640 | unsigned long flags; | 1643 | unsigned long flags; |
1641 | int i, ok_flag; | 1644 | int i, ok_flag; |