diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:38 -0400 |
commit | 6518bbb803fe02b15a3211c8db2afdff0ac4f808 (patch) | |
tree | 85b5df710063c22164150fb4fcf37098f188240a /net | |
parent | dbf02fae406daf4d583a279743869c686024c341 (diff) |
irda: convert to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/irda/irlan/irlan_eth.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c index 64230cffcfee..7b6b631f647f 100644 --- a/net/irda/irlan/irlan_eth.c +++ b/net/irda/irlan/irlan_eth.c | |||
@@ -41,7 +41,8 @@ | |||
41 | 41 | ||
42 | static int irlan_eth_open(struct net_device *dev); | 42 | static int irlan_eth_open(struct net_device *dev); |
43 | static int irlan_eth_close(struct net_device *dev); | 43 | static int irlan_eth_close(struct net_device *dev); |
44 | static int irlan_eth_xmit(struct sk_buff *skb, struct net_device *dev); | 44 | static netdev_tx_t irlan_eth_xmit(struct sk_buff *skb, |
45 | struct net_device *dev); | ||
45 | static void irlan_eth_set_multicast_list( struct net_device *dev); | 46 | static void irlan_eth_set_multicast_list( struct net_device *dev); |
46 | static struct net_device_stats *irlan_eth_get_stats(struct net_device *dev); | 47 | static struct net_device_stats *irlan_eth_get_stats(struct net_device *dev); |
47 | 48 | ||
@@ -162,7 +163,8 @@ static int irlan_eth_close(struct net_device *dev) | |||
162 | * Transmits ethernet frames over IrDA link. | 163 | * Transmits ethernet frames over IrDA link. |
163 | * | 164 | * |
164 | */ | 165 | */ |
165 | static int irlan_eth_xmit(struct sk_buff *skb, struct net_device *dev) | 166 | static netdev_tx_t irlan_eth_xmit(struct sk_buff *skb, |
167 | struct net_device *dev) | ||
166 | { | 168 | { |
167 | struct irlan_cb *self = netdev_priv(dev); | 169 | struct irlan_cb *self = netdev_priv(dev); |
168 | int ret; | 170 | int ret; |