summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-11-02 10:12:23 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2017-11-02 10:12:23 -0400
commit106bb74712a7926335598355f30e758dd337fc28 (patch)
tree90bcaf0241ad26960adfdf23859b713b7a59b95a
parentcc44b2c080a26fd030ba764af5fd725042d48c20 (diff)
downloadlongterm-queue-4.8-106bb74712a7926335598355f30e758dd337fc28.tar.gz
macvlan: trivial context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/macvlan-Fix-device-ref-leak-when-purging-bc_queue.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/queue/macvlan-Fix-device-ref-leak-when-purging-bc_queue.patch b/queue/macvlan-Fix-device-ref-leak-when-purging-bc_queue.patch
index 084cdaf..77d11eb 100644
--- a/queue/macvlan-Fix-device-ref-leak-when-purging-bc_queue.patch
+++ b/queue/macvlan-Fix-device-ref-leak-when-purging-bc_queue.patch
@@ -1,4 +1,4 @@
-From f6478218e6edc2a587b8f132f66373baa7b2497c Mon Sep 17 00:00:00 2001
+From 6f65a957266c290435e1dc27331a4f5b134a5599 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 20 Apr 2017 20:55:12 +0800
Subject: [PATCH] macvlan: Fix device ref leak when purging bc_queue
@@ -17,7 +17,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
-index 9261722960a7..b34eaaae03fd 100644
+index 3234fcdea317..67f86639d06d 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -1139,6 +1139,7 @@ static int macvlan_port_create(struct net_device *dev)
@@ -43,7 +43,7 @@ index 9261722960a7..b34eaaae03fd 100644
+ kfree_skb(skb);
+ }
- kfree(port);
+ kfree_rcu(port, rcu);
}
--
2.12.0