Commit 0fc48098 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller

appletalk: convert drivers to netdev_tx_t

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3b29a56d
...@@ -192,7 +192,8 @@ static irqreturn_t cops_interrupt (int irq, void *dev_id); ...@@ -192,7 +192,8 @@ static irqreturn_t cops_interrupt (int irq, void *dev_id);
static void cops_poll (unsigned long ltdev); static void cops_poll (unsigned long ltdev);
static void cops_timeout(struct net_device *dev); static void cops_timeout(struct net_device *dev);
static void cops_rx (struct net_device *dev); static void cops_rx (struct net_device *dev);
static int cops_send_packet (struct sk_buff *skb, struct net_device *dev); static netdev_tx_t cops_send_packet (struct sk_buff *skb,
struct net_device *dev);
static void set_multicast_list (struct net_device *dev); static void set_multicast_list (struct net_device *dev);
static int cops_ioctl (struct net_device *dev, struct ifreq *rq, int cmd); static int cops_ioctl (struct net_device *dev, struct ifreq *rq, int cmd);
static int cops_close (struct net_device *dev); static int cops_close (struct net_device *dev);
...@@ -875,7 +876,8 @@ static void cops_timeout(struct net_device *dev) ...@@ -875,7 +876,8 @@ static void cops_timeout(struct net_device *dev)
* Make the card transmit a LocalTalk packet. * Make the card transmit a LocalTalk packet.
*/ */
static int cops_send_packet(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t cops_send_packet(struct sk_buff *skb,
struct net_device *dev)
{ {
struct cops_local *lp = netdev_priv(dev); struct cops_local *lp = netdev_priv(dev);
int ioaddr = dev->base_addr; int ioaddr = dev->base_addr;
......
...@@ -48,7 +48,8 @@ static int ipddp_mode = IPDDP_DECAP; ...@@ -48,7 +48,8 @@ static int ipddp_mode = IPDDP_DECAP;
#endif #endif
/* Index to functions, as function prototypes. */ /* Index to functions, as function prototypes. */
static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev); static netdev_tx_t ipddp_xmit(struct sk_buff *skb,
struct net_device *dev);
static int ipddp_create(struct ipddp_route *new_rt); static int ipddp_create(struct ipddp_route *new_rt);
static int ipddp_delete(struct ipddp_route *rt); static int ipddp_delete(struct ipddp_route *rt);
static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt); static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt);
...@@ -113,7 +114,7 @@ static struct net_device * __init ipddp_init(void) ...@@ -113,7 +114,7 @@ static struct net_device * __init ipddp_init(void)
/* /*
* Transmit LLAP/ELAP frame using aarp_send_ddp. * Transmit LLAP/ELAP frame using aarp_send_ddp.
*/ */
static int ipddp_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t ipddp_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
__be32 paddr = skb_rtable(skb)->rt_gateway; __be32 paddr = skb_rtable(skb)->rt_gateway;
struct ddpehdr *ddp; struct ddpehdr *ddp;
......
...@@ -697,7 +697,7 @@ static int do_read(struct net_device *dev, void *cbuf, int cbuflen, ...@@ -697,7 +697,7 @@ static int do_read(struct net_device *dev, void *cbuf, int cbuflen,
static struct timer_list ltpc_timer; static struct timer_list ltpc_timer;
static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev); static netdev_tx_t ltpc_xmit(struct sk_buff *skb, struct net_device *dev);
static int read_30 ( struct net_device *dev) static int read_30 ( struct net_device *dev)
{ {
...@@ -895,7 +895,7 @@ static void ltpc_poll(unsigned long l) ...@@ -895,7 +895,7 @@ static void ltpc_poll(unsigned long l)
/* DDP to LLAP translation */ /* DDP to LLAP translation */
static int ltpc_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t ltpc_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
/* in kernel 1.3.xx, on entry skb->data points to ddp header, /* in kernel 1.3.xx, on entry skb->data points to ddp header,
* and skb->len is the length of the ddp data + ddp header * and skb->len is the length of the ddp data + ddp header
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment