lkml.org 
[lkml]   [2003]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[patch] 2.5.70-mm6: ethertap.c doesn't compile

I got the following compile error in 2.5.70-mm6:

<-- snip -->

...
CC drivers/net/ethertap.o
drivers/net/ethertap.c: In function `ethertap_rx':
drivers/net/ethertap.c:295: structure has no member named `protocol'
drivers/net/ethertap.c:300: structure has no member named `receive_queue'
drivers/net/ethertap.c:307: structure has no member named `receive_queue'
drivers/net/ethertap.c: In function `ethertap_close':
drivers/net/ethertap.c:323: structure has no member named `socket'
make[2]: *** [drivers/net/ethertap.o] Error 1

<-- snip -->

The patch below fixes the compilation.



cu
Adrian

--- linux-2.5.70-mm6/drivers/net/ethertap.c.old 2003-06-08 17:48:57.000000000 +0200
+++ linux-2.5.70-mm6/drivers/net/ethertap.c 2003-06-08 17:49:53.000000000 +0200
@@ -292,19 +292,19 @@

static void ethertap_rx(struct sock *sk, int len)
{
- struct net_device *dev = tap_map[sk->protocol];
+ struct net_device *dev = tap_map[sk->sk_protocol];
struct sk_buff *skb;

if (dev==NULL) {
printk(KERN_CRIT "ethertap: bad unit!\n");
- skb_queue_purge(&sk->receive_queue);
+ skb_queue_purge(&sk->sk_receive_queue);
return;
}

if (ethertap_debug > 3)
printk("%s: ethertap_rx()\n", dev->name);

- while ((skb = skb_dequeue(&sk->receive_queue)) != NULL)
+ while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL)
ethertap_rx_skb(skb, dev);
}

@@ -320,7 +320,7 @@

if (sk) {
lp->nl = NULL;
- sock_release(sk->socket);
+ sock_release(sk->sk_socket);
}

return 0;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:36    [from the cache]
©2003-2011 Jasper Spaans