mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ipv6 netevent: Remove old_neigh from netevent_redirect. 

The only user is cxgb3 driver.

old_neigh is used to check device change, but it must not happen
on redirect.  In this sense, we can remove old_neigh argument.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki / 吉藤英明 2013-01-14 09:28:27 +00:00 committed by David S. Miller
parent a66f566afc
commit 6059283378
3 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
View File

@ -64,9 +64,8 @@ static const unsigned int MAX_ATIDS = 64 * 1024;
static const unsigned int ATID_BASE = 0x10000; static const unsigned int ATID_BASE = 0x10000;
static void cxgb_neigh_update(struct neighbour *neigh); static void cxgb_neigh_update(struct neighbour *neigh);
static void cxgb_redirect(struct dst_entry *old, struct neighbour *old_neigh, static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new,
struct dst_entry *new, struct neighbour *new_neigh, struct neighbour *neigh, const void *daddr);
const void *daddr);
static inline int offload_activated(struct t3cdev *tdev) static inline int offload_activated(struct t3cdev *tdev)
{ {
@ -970,10 +969,9 @@ static int nb_callback(struct notifier_block *self, unsigned long event,
} }
case (NETEVENT_REDIRECT):{ case (NETEVENT_REDIRECT):{
struct netevent_redirect *nr = ctx; struct netevent_redirect *nr = ctx;
cxgb_redirect(nr->old, nr->old_neigh, cxgb_redirect(nr->old, nr->new, nr->neigh,
nr->new, nr->new_neigh,
nr->daddr); nr->daddr);
cxgb_neigh_update(nr->new_neigh); cxgb_neigh_update(nr->neigh);
break; break;
} }
default: default:
@ -1109,11 +1107,11 @@ static void set_l2t_ix(struct t3cdev *tdev, u32 tid, struct l2t_entry *e)
tdev->send(tdev, skb); tdev->send(tdev, skb);
} }
static void cxgb_redirect(struct dst_entry *old, struct neighbour *old_neigh, static void cxgb_redirect(struct dst_entry *old, struct dst_entry *new,
struct dst_entry *new, struct neighbour *new_neigh, struct neighbour *neigh,
const void *daddr) const void *daddr)
{ {
struct net_device *olddev, *newdev; struct net_device *dev;
struct tid_info *ti; struct tid_info *ti;
struct t3cdev *tdev; struct t3cdev *tdev;
u32 tid; u32 tid;
@ -1121,26 +1119,15 @@ static void cxgb_redirect(struct dst_entry *old, struct neighbour *old_neigh,
struct l2t_entry *e; struct l2t_entry *e;
struct t3c_tid_entry *te; struct t3c_tid_entry *te;
olddev = old_neigh->dev; dev = neigh->dev;
newdev = new_neigh->dev;
if (!is_offloading(olddev)) if (!is_offloading(dev))
return; return;
if (!is_offloading(newdev)) { tdev = dev2t3cdev(dev);
pr_warn("%s: Redirect to non-offload device ignored\n",
__func__);
return;
}
tdev = dev2t3cdev(olddev);
BUG_ON(!tdev); BUG_ON(!tdev);
if (tdev != dev2t3cdev(newdev)) {
pr_warn("%s: Redirect to different offload device ignored\n",
__func__);
return;
}
/* Add new L2T entry */ /* Add new L2T entry */
e = t3_l2t_get(tdev, new, newdev, daddr); e = t3_l2t_get(tdev, new, dev, daddr);
if (!e) { if (!e) {
pr_err("%s: couldn't allocate new l2t entry!\n", __func__); pr_err("%s: couldn't allocate new l2t entry!\n", __func__);
return; return;

3
include/net/netevent.h
View File

@ -16,9 +16,8 @@ struct neighbour;
struct netevent_redirect { struct netevent_redirect {
struct dst_entry *old; struct dst_entry *old;
struct neighbour *old_neigh;
struct dst_entry *new; struct dst_entry *new;
struct neighbour *new_neigh; struct neighbour *neigh;
const void *daddr; const void *daddr;
}; };

3
net/ipv6/route.c
View File

@ -1803,10 +1803,9 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu
goto out; goto out;
netevent.old = &rt->dst; netevent.old = &rt->dst;
netevent.old_neigh = old_neigh;
netevent.new = &nrt->dst; netevent.new = &nrt->dst;
netevent.new_neigh = neigh;
netevent.daddr = &msg->dest; netevent.daddr = &msg->dest;
netevent.neigh = neigh;
call_netevent_notifiers(NETEVENT_REDIRECT, &netevent); call_netevent_notifiers(NETEVENT_REDIRECT, &netevent);
if (rt->rt6i_flags & RTF_CACHE) { if (rt->rt6i_flags & RTF_CACHE) {