diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-02-21 09:36:14 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-02-21 09:36:14 -0500 |
| commit | c41ffb47ea41f6bb778e744b7a73812abfa3de3f (patch) | |
| tree | 8316f6d4616797b94a8e34a875e162626c7eeaff /drivers/net | |
| parent | 0f5d3ef0d1b75cd975268f5f3ce80f7f1815c8af (diff) | |
| parent | a4a663513af05a98d6085d92f85c16bb64ac4050 (diff) | |
Merge tag 'v3.0.22' into v3.0-rt-next
This is the 3.0.22 stable release
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/cxgb3/cxgb3_offload.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c index 3f2e12c3ac1b..015b5152b0de 100644 --- a/drivers/net/cxgb3/cxgb3_offload.c +++ b/drivers/net/cxgb3/cxgb3_offload.c @@ -971,7 +971,7 @@ static int nb_callback(struct notifier_block *self, unsigned long event, case (NETEVENT_REDIRECT):{ struct netevent_redirect *nr = ctx; cxgb_redirect(nr->old, nr->new); - cxgb_neigh_update(nr->new->neighbour); + cxgb_neigh_update(dst_get_neighbour(nr->new)); break; } default: @@ -1116,8 +1116,8 @@ static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new) struct l2t_entry *e; struct t3c_tid_entry *te; - olddev = old->neighbour->dev; - newdev = new->neighbour->dev; + olddev = dst_get_neighbour(old)->dev; + newdev = dst_get_neighbour(new)->dev; if (!is_offloading(olddev)) return; if (!is_offloading(newdev)) { @@ -1134,7 +1134,7 @@ static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new) } /* Add new L2T entry */ - e = t3_l2t_get(tdev, new->neighbour, newdev); + e = t3_l2t_get(tdev, dst_get_neighbour(new), newdev); if (!e) { printk(KERN_ERR "%s: couldn't allocate new l2t entry!\n", __func__); |