From 9427b0ecfe074f8e150081aaa66820555981458c Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Thu, 20 Oct 2011 04:27:24 +0000
Subject: [PATCH] --- yaml --- r: 266908 b: refs/heads/master c:
 2259fef0bb80a8fc842b5690b89a640464df2859 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/macvtap.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 51e0af68be0a..f1e5751ab227 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 047af9cfedfa357e1497e327eaa893253ca51971
+refs/heads/master: 2259fef0bb80a8fc842b5690b89a640464df2859
diff --git a/trunk/drivers/net/macvtap.c b/trunk/drivers/net/macvtap.c
index 1d9c9c209672..515aa873929e 100644
--- a/trunk/drivers/net/macvtap.c
+++ b/trunk/drivers/net/macvtap.c
@@ -339,6 +339,11 @@ static void macvtap_sock_write_space(struct sock *sk)
 		wake_up_interruptible_poll(wqueue, POLLOUT | POLLWRNORM | POLLWRBAND);
 }
 
+static void macvtap_sock_destruct(struct sock *sk)
+{
+	skb_queue_purge(&sk->sk_receive_queue);
+}
+
 static int macvtap_open(struct inode *inode, struct file *file)
 {
 	struct net *net = current->nsproxy->net_ns;
@@ -369,6 +374,7 @@ static int macvtap_open(struct inode *inode, struct file *file)
 	q->sock.ops = &macvtap_socket_ops;
 	sock_init_data(&q->sock, &q->sk);
 	q->sk.sk_write_space = macvtap_sock_write_space;
+	q->sk.sk_destruct = macvtap_sock_destruct;
 	q->flags = IFF_VNET_HDR | IFF_NO_PI | IFF_TAP;
 	q->vnet_hdr_sz = sizeof(struct virtio_net_hdr);