Merge branch 'x86/amd-nb' into x86/apic-cleanups

Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform

Conflicts:
	arch/x86/include/asm/io_apic.h

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index feaabc103ce6..401af9596709 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -241,11 +241,11 @@ __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, struct net_device *
         }
         if (neigh_event_send(n, skb_res) == 0) {
                 int err;
+                char haddr[MAX_ADDR_LEN];
 
-                read_lock(&n->lock);
-                err = dev_hard_header(skb, dev, ntohs(skb->protocol),
-                                      n->ha, NULL, skb->len);
-                read_unlock(&n->lock);
+                neigh_ha_snapshot(haddr, n, dev);
+                err = dev_hard_header(skb, dev, ntohs(skb->protocol), haddr,
+                                      NULL, skb->len);
 
                 if (err < 0) {
                         neigh_release(n);