aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/hamachi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/hamachi.c')
-rw-r--r--drivers/net/hamachi.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 635341d6a028..1d5064a09aca 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -557,7 +557,8 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
557static void hamachi_timer(unsigned long data); 557static void hamachi_timer(unsigned long data);
558static void hamachi_tx_timeout(struct net_device *dev); 558static void hamachi_tx_timeout(struct net_device *dev);
559static void hamachi_init_ring(struct net_device *dev); 559static void hamachi_init_ring(struct net_device *dev);
560static int hamachi_start_xmit(struct sk_buff *skb, struct net_device *dev); 560static netdev_tx_t hamachi_start_xmit(struct sk_buff *skb,
561 struct net_device *dev);
561static irqreturn_t hamachi_interrupt(int irq, void *dev_instance); 562static irqreturn_t hamachi_interrupt(int irq, void *dev_instance);
562static int hamachi_rx(struct net_device *dev); 563static int hamachi_rx(struct net_device *dev);
563static inline int hamachi_tx(struct net_device *dev); 564static inline int hamachi_tx(struct net_device *dev);
@@ -1263,7 +1264,8 @@ do { \
1263} while (0) 1264} while (0)
1264#endif 1265#endif
1265 1266
1266static int hamachi_start_xmit(struct sk_buff *skb, struct net_device *dev) 1267static netdev_tx_t hamachi_start_xmit(struct sk_buff *skb,
1268 struct net_device *dev)
1267{ 1269{
1268 struct hamachi_private *hmp = netdev_priv(dev); 1270 struct hamachi_private *hmp = netdev_priv(dev);
1269 unsigned entry; 1271 unsigned entry;