[netdrvr] atlx: code movement: move atl1 parameter parsing

[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 3c0cb8557058bfbd70009e6c7a7c289849f7f41e..f510140885ae407bdaf0878aafe375c7538d2b49 100644 (file)
--- a/drivers/net/cxgb3/l2t.c
+++ b/drivers/net/cxgb3/l2t.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (c) 2003-2007 Chelsio, Inc. All rights reserved.
- * Copyright (c) 2006-2007 Open Grid Computing, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -338,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_info(neigh->dev)->vlan_id;
                else
                        e->vlan = VLAN_NONE;
                spin_unlock(&e->lock);
@@ -405,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);