Commit 046511a4 authored by Martin Schlemmer's avatar Martin Schlemmer Committed by Linus Torvalds

o ethertap: fix struct sock cleanup leftover

parent 402e9d54
...@@ -292,19 +292,19 @@ static __inline__ int ethertap_rx_skb(struct sk_buff *skb, struct net_device *de ...@@ -292,19 +292,19 @@ static __inline__ int ethertap_rx_skb(struct sk_buff *skb, struct net_device *de
static void ethertap_rx(struct sock *sk, int len) 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; struct sk_buff *skb;
if (dev==NULL) { if (dev==NULL) {
printk(KERN_CRIT "ethertap: bad unit!\n"); printk(KERN_CRIT "ethertap: bad unit!\n");
skb_queue_purge(&sk->receive_queue); skb_queue_purge(&sk->sk_receive_queue);
return; return;
} }
if (ethertap_debug > 3) if (ethertap_debug > 3)
printk("%s: ethertap_rx()\n", dev->name); 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); ethertap_rx_skb(skb, dev);
} }
...@@ -320,7 +320,7 @@ static int ethertap_close(struct net_device *dev) ...@@ -320,7 +320,7 @@ static int ethertap_close(struct net_device *dev)
if (sk) { if (sk) {
lp->nl = NULL; lp->nl = NULL;
sock_release(sk->socket); sock_release(sk->sk_socket);
} }
return 0; return 0;
......
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