vlan: move struct vlan_dev_info to private header

[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 d660af74606e4abbb20f9d964c0080367425662e..825e510bd9ed7019a70b4115c385f521b80fcbf6 100644 (file)
--- a/drivers/net/cxgb3/l2t.c
+++ b/drivers/net/cxgb3/l2t.c
@@ -337,7 +337,7 @@ struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct neighbour *neigh,
                atomic_set(&e->refcnt, 1);
                neigh_replace(e, neigh);
                if (neigh->dev->priv_flags & IFF_802_1Q_VLAN)
-                       e->vlan = VLAN_DEV_INFO(neigh->dev)->vlan_id;
+                       e->vlan = vlan_dev_vlan_id(neigh->dev);
                else
                        e->vlan = VLAN_NONE;
                spin_unlock(&e->lock);
@@ -404,10 +404,10 @@ 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) ?
+                       e->state = neigh->nud_state & NUD_CONNECTED ?
                            L2T_STATE_VALID : L2T_STATE_STALE;
                        if (memcmp(e->dmac, neigh->ha, 6))
                                setup_l2e_send_pending(dev, NULL, e);