aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/appletalk
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-08-31 15:50:56 -0400
committerDavid S. Miller <davem@davemloft.net>2009-09-01 04:13:55 -0400
commit0fc480987e69f22b9212f087545b4d1ca6950807 (patch)
treea02c24afd26b2caff6fcc8fea9e2f3f76bf87cc9 /drivers/net/appletalk
parent3b29a56d31d585d39bf9ffe9ef1f10bd637ee0f1 (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')
-rw-r--r--drivers/net/appletalk/cops.c6
-rw-r--r--drivers/net/appletalk/ipddp.c5
-rw-r--r--drivers/net/appletalk/ltpc.c4
3 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index 29b279f88ef..b5dc7f55072 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);
192static void cops_poll (unsigned long ltdev); 192static void cops_poll (unsigned long ltdev);
193static void cops_timeout(struct net_device *dev); 193static void cops_timeout(struct net_device *dev);
194static void cops_rx (struct net_device *dev); 194static void cops_rx (struct net_device *dev);
195static int cops_send_packet (struct sk_buff *skb, struct net_device *dev); 195static netdev_tx_t cops_send_packet (struct sk_buff *skb,
196 struct net_device *dev);
196static void set_multicast_list (struct net_device *dev); 197static void set_multicast_list (struct net_device *dev);
197static int cops_ioctl (struct net_device *dev, struct ifreq *rq, int cmd); 198static int cops_ioctl (struct net_device *dev, struct ifreq *rq, int cmd);
198static int cops_close (struct net_device *dev); 199static 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
878static int cops_send_packet(struct sk_buff *skb, struct net_device *dev) 879static 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;
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index 6cfd961bb8d..bea87da97e3 100644
--- a/drivers/net/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -48,7 +48,8 @@ static int ipddp_mode = IPDDP_DECAP;
48#endif 48#endif
49 49
50/* Index to functions, as function prototypes. */ 50/* Index to functions, as function prototypes. */
51static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev); 51static netdev_tx_t ipddp_xmit(struct sk_buff *skb,
52 struct net_device *dev);
52static int ipddp_create(struct ipddp_route *new_rt); 53static int ipddp_create(struct ipddp_route *new_rt);
53static int ipddp_delete(struct ipddp_route *rt); 54static int ipddp_delete(struct ipddp_route *rt);
54static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt); 55static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt);
@@ -113,7 +114,7 @@ static struct net_device * __init ipddp_init(void)
113/* 114/*
114 * Transmit LLAP/ELAP frame using aarp_send_ddp. 115 * Transmit LLAP/ELAP frame using aarp_send_ddp.
115 */ 116 */
116static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev) 117static netdev_tx_t ipddp_xmit(struct sk_buff *skb, struct net_device *dev)
117{ 118{
118 __be32 paddr = skb_rtable(skb)->rt_gateway; 119 __be32 paddr = skb_rtable(skb)->rt_gateway;
119 struct ddpehdr *ddp; 120 struct ddpehdr *ddp;
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index c80fb9cf8ff..08760baece7 100644
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -697,7 +697,7 @@ static int do_read(struct net_device *dev, void *cbuf, int cbuflen,
697 697
698static struct timer_list ltpc_timer; 698static struct timer_list ltpc_timer;
699 699
700static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev); 700static netdev_tx_t ltpc_xmit(struct sk_buff *skb, struct net_device *dev);
701 701
702static int read_30 ( struct net_device *dev) 702static int read_30 ( struct net_device *dev)
703{ 703{
@@ -895,7 +895,7 @@ static void ltpc_poll(unsigned long l)
895 895
896/* DDP to LLAP translation */ 896/* DDP to LLAP translation */
897 897
898static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev) 898static netdev_tx_t ltpc_xmit(struct sk_buff *skb, struct net_device *dev)
899{ 899{
900 /* in kernel 1.3.xx, on entry skb->data points to ddp header, 900 /* in kernel 1.3.xx, on entry skb->data points to ddp header,
901 * and skb->len is the length of the ddp data + ddp header 901 * and skb->len is the length of the ddp data + ddp header