| Message ID | 1353089303.10798.38.camel@edumazet-glaptop |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 11/16/2012 01:08 PM, Eric Dumazet wrote: > From: Eric Dumazet <edumazet@google.com> > > offload_base is protected by offload_lock, not ptype_lock > > Signed-off-by: Eric Dumazet <edumazet@google.com> > Cc: Vlad Yasevich <vyasevic@redhat.com> > --- > net/core/dev.c | 4 ++-- > 1 file 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); > Acked-by: Vlad Yasevich <vyasevic@redhat.com> I distinctly remember changing that, but just look at my patches and it's there.... Sorry... -vlad -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Vlad Yasevich <vyasevic@redhat.com> Date: Fri, 16 Nov 2012 13:15:54 -0500 > On 11/16/2012 01:08 PM, Eric Dumazet wrote: >> From: Eric Dumazet <edumazet@google.com> >> >> offload_base is protected by offload_lock, not ptype_lock >> >> Signed-off-by: Eric Dumazet <edumazet@google.com> ... > Acked-by: Vlad Yasevich <vyasevic@redhat.com> Applied, thanks everyone. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);