Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / cxgb3 / l2t.c

diff --git a/drivers/net/cxgb3/l2t.c b/drivers/net/cxgb3/l2t.c
index 17ed4c3527b7727bc033ae4d843490f0bf3b0ea0..865faee53e1720e42241aad509bbc1956e323205 100644 (file)
--- a/drivers/net/cxgb3/l2t.c
+++ b/drivers/net/cxgb3/l2t.c
@@ -404,7 +404,7 @@ found:
                        if (neigh->nud_state & NUD_FAILED) {
                                arpq = e->arpq_head;
                                e->arpq_head = e->arpq_tail = NULL;
-                       } else if (neigh_is_connected(neigh))
+                       } else if (neigh->nud_state & (NUD_CONNECTED|NUD_STALE))
                                setup_l2e_send_pending(dev, NULL, e);
                } else {
                        e->state = neigh_is_connected(neigh) ?