summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-01 14:45:33 -0800
committerDavid S. Miller <davem@davemloft.net>2011-03-01 14:45:33 -0800
commit69ead7afdf6028184f713a77376ee26f8aaafdcd (patch)
treebd5cd86f9786daadfd5425f65106bd1c7383fcc7 /include/net
parent80c0bc9e37adfc892af82cb6aa8cace79f8a96cb (diff)
downloadlinux-69ead7afdf6028184f713a77376ee26f8aaafdcd.tar.gz
linux-69ead7afdf6028184f713a77376ee26f8aaafdcd.tar.bz2
linux-69ead7afdf6028184f713a77376ee26f8aaafdcd.zip
ipv6: Normalize arguments to ip6_dst_blackhole().
Return a dst pointer which is potentitally error encoded. Don't pass original dst pointer by reference, pass a struct net instead of a socket, and elide the flow argument since it is unnecessary. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ipv6.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 8f78aace0a9d..5d125c1293a9 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -520,9 +520,8 @@ extern struct dst_entry * ip6_sk_dst_lookup_flow(struct sock *sk,
struct flowi *fl,
const struct in6_addr *final_dst,
bool can_sleep);
-extern int ip6_dst_blackhole(struct sock *sk,
- struct dst_entry **dst,
- struct flowi *fl);
+extern struct dst_entry * ip6_dst_blackhole(struct net *net,
+ struct dst_entry *orig_dst);
/*
* skb processing functions