diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 21:50:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 21:50:57 -0400 |
| commit | a5324343955997d1439f26518ddac567cd5d134b (patch) | |
| tree | f43558389c41e3a0f076c4ee55d77c4aa1561779 /net/ipv6/ndisc.c | |
| parent | 8199d3a79c224bbe5943fa08684e1f93a17881b0 (diff) | |
| parent | a4936044001694f033fe4ea94d6034d51a6b465c (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'net/ipv6/ndisc.c')
| -rw-r--r-- | net/ipv6/ndisc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 7c291f4e9edc..7ae72d4c9bd2 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
| @@ -955,7 +955,7 @@ static void ndisc_recv_na(struct sk_buff *skb) | |||
| 955 | struct rt6_info *rt; | 955 | struct rt6_info *rt; |
| 956 | rt = rt6_get_dflt_router(saddr, dev); | 956 | rt = rt6_get_dflt_router(saddr, dev); |
| 957 | if (rt) | 957 | if (rt) |
| 958 | ip6_del_rt(rt, NULL, NULL); | 958 | ip6_del_rt(rt, NULL, NULL, NULL); |
| 959 | } | 959 | } |
| 960 | 960 | ||
| 961 | out: | 961 | out: |
| @@ -1096,7 +1096,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) | |||
| 1096 | 1096 | ||
| 1097 | if (rt && lifetime == 0) { | 1097 | if (rt && lifetime == 0) { |
| 1098 | neigh_clone(neigh); | 1098 | neigh_clone(neigh); |
| 1099 | ip6_del_rt(rt, NULL, NULL); | 1099 | ip6_del_rt(rt, NULL, NULL, NULL); |
| 1100 | rt = NULL; | 1100 | rt = NULL; |
| 1101 | } | 1101 | } |
| 1102 | 1102 | ||