diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-08-31 15:50:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-01 04:13:55 -0400 |
commit | 0fc480987e69f22b9212f087545b4d1ca6950807 (patch) | |
tree | a02c24afd26b2caff6fcc8fea9e2f3f76bf87cc9 /drivers/net/appletalk/cops.c | |
parent | 3b29a56d31d585d39bf9ffe9ef1f10bd637ee0f1 (diff) |
appletalk: convert drivers to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/appletalk/cops.c')
-rw-r--r-- | drivers/net/appletalk/cops.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index 29b279f88efb..b5dc7f550725 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c | |||
@@ -192,7 +192,8 @@ static irqreturn_t cops_interrupt (int irq, void *dev_id); | |||
192 | static void cops_poll (unsigned long ltdev); | 192 | static void cops_poll (unsigned long ltdev); |
193 | static void cops_timeout(struct net_device *dev); | 193 | static void cops_timeout(struct net_device *dev); |
194 | static void cops_rx (struct net_device *dev); | 194 | static void cops_rx (struct net_device *dev); |
195 | static int cops_send_packet (struct sk_buff *skb, struct net_device *dev); | 195 | static netdev_tx_t cops_send_packet (struct sk_buff *skb, |
196 | struct net_device *dev); | ||
196 | static void set_multicast_list (struct net_device *dev); | 197 | static void set_multicast_list (struct net_device *dev); |
197 | static int cops_ioctl (struct net_device *dev, struct ifreq *rq, int cmd); | 198 | static int cops_ioctl (struct net_device *dev, struct ifreq *rq, int cmd); |
198 | static int cops_close (struct net_device *dev); | 199 | static int cops_close (struct net_device *dev); |
@@ -875,7 +876,8 @@ static void cops_timeout(struct net_device *dev) | |||
875 | * Make the card transmit a LocalTalk packet. | 876 | * Make the card transmit a LocalTalk packet. |
876 | */ | 877 | */ |
877 | 878 | ||
878 | static int cops_send_packet(struct sk_buff *skb, struct net_device *dev) | 879 | static netdev_tx_t cops_send_packet(struct sk_buff *skb, |
880 | struct net_device *dev) | ||
879 | { | 881 | { |
880 | struct cops_local *lp = netdev_priv(dev); | 882 | struct cops_local *lp = netdev_priv(dev); |
881 | int ioaddr = dev->base_addr; | 883 | int ioaddr = dev->base_addr; |