summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2012-11-16 08:08:23 +0000
committerDavid S. Miller <davem@davemloft.net>2012-11-16 13:41:08 -0500
commitc53aa5058ad5ca8876a47d6639ad4d4f2c5ed584 (patch)
treecff2b24d78e6fcbfa37e168c67703a8800885966 /net/core
parent545b29019c8959c805abfe8194d47e989f1a6e5f (diff)
downloadop-kernel-dev-c53aa5058ad5ca8876a47d6639ad4d4f2c5ed584.zip
op-kernel-dev-c53aa5058ad5ca8876a47d6639ad4d4f2c5ed584.tar.gz
net: use right lock in __dev_remove_offload
offload_base is protected by offload_lock, not ptype_lock Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Vlad Yasevich <vyasevic@redhat.com> Acked-by: Vlad Yasevich <vyasevic@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index cf105e8..2705a2a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -513,7 +513,7 @@ void __dev_remove_offload(struct packet_offload *po)
struct list_head *head = &offload_base;
struct packet_offload *po1;
- spin_lock(&ptype_lock);
+ spin_lock(&offload_lock);
list_for_each_entry(po1, head, list) {
if (po == po1) {
@@ -524,7 +524,7 @@ void __dev_remove_offload(struct packet_offload *po)
pr_warn("dev_remove_offload: %p not found\n", po);
out:
- spin_unlock(&ptype_lock);
+ spin_unlock(&offload_lock);
}
EXPORT_SYMBOL(__dev_remove_offload);
OpenPOWER on IntegriCloud