diff options
Diffstat (limited to 'drivers/net/tokenring/ibmtr.c')
-rw-r--r-- | drivers/net/tokenring/ibmtr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index 96d00c8f8d3e..525bbc5b9c9d 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c | |||
@@ -191,7 +191,8 @@ static int tok_init_card(struct net_device *dev); | |||
191 | static void tok_open_adapter(unsigned long dev_addr); | 191 | static void tok_open_adapter(unsigned long dev_addr); |
192 | static void open_sap(unsigned char type, struct net_device *dev); | 192 | static void open_sap(unsigned char type, struct net_device *dev); |
193 | static void tok_set_multicast_list(struct net_device *dev); | 193 | static void tok_set_multicast_list(struct net_device *dev); |
194 | static int tok_send_packet(struct sk_buff *skb, struct net_device *dev); | 194 | static netdev_tx_t tok_send_packet(struct sk_buff *skb, |
195 | struct net_device *dev); | ||
195 | static int tok_close(struct net_device *dev); | 196 | static int tok_close(struct net_device *dev); |
196 | static irqreturn_t tok_interrupt(int irq, void *dev_id); | 197 | static irqreturn_t tok_interrupt(int irq, void *dev_id); |
197 | static void initial_tok_int(struct net_device *dev); | 198 | static void initial_tok_int(struct net_device *dev); |
@@ -1022,7 +1023,8 @@ static void tok_set_multicast_list(struct net_device *dev) | |||
1022 | 1023 | ||
1023 | #define STATION_ID_OFST 4 | 1024 | #define STATION_ID_OFST 4 |
1024 | 1025 | ||
1025 | static int tok_send_packet(struct sk_buff *skb, struct net_device *dev) | 1026 | static netdev_tx_t tok_send_packet(struct sk_buff *skb, |
1027 | struct net_device *dev) | ||
1026 | { | 1028 | { |
1027 | struct tok_info *ti; | 1029 | struct tok_info *ti; |
1028 | unsigned long flags; | 1030 | unsigned long flags; |