From: Denis V. Lunev Date: Sun, 23 Mar 2008 00:42:37 +0000 (-0700) Subject: [IPV4]: sk parameter is unused in ipv4_dst_blackhole. X-Git-Tag: v2.6.26-rc1~1138^2~392 X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=ce259990785595420ace616faece09255bad1163;p=net-next-2.6.git [IPV4]: sk parameter is unused in ipv4_dst_blackhole. Just remove it. Signed-off-by: Denis V. Lunev Signed-off-by: David S. Miller --- diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 1051326c36b..9ba3413a990 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -2520,7 +2520,7 @@ static struct dst_ops ipv4_dst_blackhole_ops = { }; -static int ipv4_dst_blackhole(struct rtable **rp, struct flowi *flp, struct sock *sk) +static int ipv4_dst_blackhole(struct rtable **rp, struct flowi *flp) { struct rtable *ort = *rp; struct rtable *rt = (struct rtable *) @@ -2580,7 +2580,7 @@ int ip_route_output_flow(struct net *net, struct rtable **rp, struct flowi *flp, err = __xfrm_lookup((struct dst_entry **)rp, flp, sk, flags ? XFRM_LOOKUP_WAIT : 0); if (err == -EREMOTE) - err = ipv4_dst_blackhole(rp, flp, sk); + err = ipv4_dst_blackhole(rp, flp); return err; }