diff options
author | Thomas Graf <tgraf@suug.ch> | 2006-08-22 03:00:21 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 17:55:11 -0400 |
commit | e0a1ad73d34fd6dfdb630479400511e9879069c0 (patch) | |
tree | eda7611d42a7184131056e08b0bfb13d18b0e24e /net/ipv6/ndisc.c | |
parent | e9ce1cd3cf6cf35b21d0ce990f2e738f35907386 (diff) |
[IPv6] route: Simplify ip6_del_rt()
Provide a simple ip6_del_rt() for the majority of users and
an alternative for the exception via netlink. Avoids code
obfuscation.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 5743e8bffefd..419d65163819 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -961,7 +961,7 @@ static void ndisc_recv_na(struct sk_buff *skb) | |||
961 | struct rt6_info *rt; | 961 | struct rt6_info *rt; |
962 | rt = rt6_get_dflt_router(saddr, dev); | 962 | rt = rt6_get_dflt_router(saddr, dev); |
963 | if (rt) | 963 | if (rt) |
964 | ip6_del_rt(rt, NULL, NULL, NULL); | 964 | ip6_del_rt(rt); |
965 | } | 965 | } |
966 | 966 | ||
967 | out: | 967 | out: |
@@ -1114,7 +1114,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) | |||
1114 | 1114 | ||
1115 | if (rt && lifetime == 0) { | 1115 | if (rt && lifetime == 0) { |
1116 | neigh_clone(neigh); | 1116 | neigh_clone(neigh); |
1117 | ip6_del_rt(rt, NULL, NULL, NULL); | 1117 | ip6_del_rt(rt); |
1118 | rt = NULL; | 1118 | rt = NULL; |
1119 | } | 1119 | } |
1120 | 1120 | ||