net-ipv4: remove 2 always zero parameters from ipv4_redirect()

(the parameters in question are mark and flow_flags)

Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/route.h b/include/net/route.h
index 73c605bdd6d81ae1b94474376a020e059b66365e..9883dc82f7233dede86ec2e5cfeddf09cf56d62d 100644 (file)
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -203,8 +203,7 @@ static inline int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src,
 void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu, int oif,
                      u8 protocol);
 void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu);
-void ipv4_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark,
-                  u8 protocol, int flow_flags);
+void ipv4_redirect(struct sk_buff *skb, struct net *net, int oif, u8 protocol);
 void ipv4_sk_redirect(struct sk_buff *skb, struct sock *sk);
 void ip_rt_send_redirect(struct sk_buff *skb);
 

diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 8811fe30282a18e42e7554d270693f98fe93bb49..c01fa791260d2594913d2a88c5b3824bceab975b 100644 (file)
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -463,7 +463,7 @@ static int ah4_err(struct sk_buff *skb, u32 info)
        if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH)
                ipv4_update_pmtu(skb, net, info, 0, IPPROTO_AH);
        else
-               ipv4_redirect(skb, net, 0, 0, IPPROTO_AH, 0);
+               ipv4_redirect(skb, net, 0, IPPROTO_AH);
        xfrm_state_put(x);
 
        return 0;

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 2d0274441923c343cb3f5fa71c2d1b3e70139a03..071533dd33c2a6c4bfc74a57e7ffedea0070bbfd 100644 (file)
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -822,7 +822,7 @@ static int esp4_err(struct sk_buff *skb, u32 info)
        if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH)
                ipv4_update_pmtu(skb, net, info, 0, IPPROTO_ESP);
        else
-               ipv4_redirect(skb, net, 0, 0, IPPROTO_ESP, 0);
+               ipv4_redirect(skb, net, 0, IPPROTO_ESP);
        xfrm_state_put(x);
 
        return 0;

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 8013b37b598f184c7f572a8ab560e9c06a0a9f06..d832beed6e3a3d382f96ce1de94f3ac97aeed10b 100644 (file)
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -1100,7 +1100,7 @@ void icmp_err(struct sk_buff *skb, u32 info)
        if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED)
                ipv4_update_pmtu(skb, net, info, 0, IPPROTO_ICMP);
        else if (type == ICMP_REDIRECT)
-               ipv4_redirect(skb, net, 0, 0, IPPROTO_ICMP, 0);
+               ipv4_redirect(skb, net, 0, IPPROTO_ICMP);
 }
 
 /*

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 83b80fafd8f29140762d196a6efcb2f3861cc260..38befe829caf51c56f9661abe71f3dc4a030bd86 100644 (file)
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -243,8 +243,8 @@ static void gre_err(struct sk_buff *skb, u32 info)
                return;
        }
        if (type == ICMP_REDIRECT) {
-               ipv4_redirect(skb, dev_net(skb->dev), skb->dev->ifindex, 0,
-                             IPPROTO_GRE, 0);
+               ipv4_redirect(skb, dev_net(skb->dev), skb->dev->ifindex,
+                             IPPROTO_GRE);
                return;
        }
 

diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index 1b5571cb328200ae6f8f9c66774b37e9398feb6b..de31b302d69c6bd29c1b9fb2b9f681456c6cd2c3 100644 (file)
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -320,7 +320,7 @@ static int vti4_err(struct sk_buff *skb, u32 info)
        if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH)
                ipv4_update_pmtu(skb, net, info, 0, protocol);
        else
-               ipv4_redirect(skb, net, 0, 0, protocol, 0);
+               ipv4_redirect(skb, net, 0, protocol);
        xfrm_state_put(x);
 
        return 0;

diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
index 04049d1330a29c16e8ae363613f3dac3dd31715d..9119d012ba46e2f4c6feceb3256a0902f55792cb 100644 (file)
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@@ -50,7 +50,7 @@ static int ipcomp4_err(struct sk_buff *skb, u32 info)
        if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH)
                ipv4_update_pmtu(skb, net, info, 0, IPPROTO_COMP);
        else
-               ipv4_redirect(skb, net, 0, 0, IPPROTO_COMP, 0);
+               ipv4_redirect(skb, net, 0, IPPROTO_COMP);
        xfrm_state_put(x);
 
        return 0;

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 6ff008e5818d6373bbda68dc141262d12a8f2443..e65287c27e3d85f17a03d7958f197b54528b9d10 100644 (file)
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -180,7 +180,7 @@ static int ipip_err(struct sk_buff *skb, u32 info)
        }
 
        if (type == ICMP_REDIRECT) {
-               ipv4_redirect(skb, net, t->parms.link, 0, iph->protocol, 0);
+               ipv4_redirect(skb, net, t->parms.link, iph->protocol);
                goto out;
        }
 

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 7bbe3fc80b90b6fecc13482bda838e9281ae16bc..dce2ed66ebe17fcfe6a2c612321c6284ae7bd6f5 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1130,14 +1130,14 @@ void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu)
 EXPORT_SYMBOL_GPL(ipv4_sk_update_pmtu);
 
 void ipv4_redirect(struct sk_buff *skb, struct net *net,
-                  int oif, u32 mark, u8 protocol, int flow_flags)
+                  int oif, u8 protocol)
 {
        const struct iphdr *iph = (const struct iphdr *) skb->data;
        struct flowi4 fl4;
        struct rtable *rt;
 
        __build_flow_key(net, &fl4, NULL, iph, oif,
-                        RT_TOS(iph->tos), protocol, mark, flow_flags);
+                        RT_TOS(iph->tos), protocol, 0, 0);
        rt = __ip_route_output_key(net, &fl4);
        if (!IS_ERR(rt)) {
                __ip_do_redirect(rt, skb, &fl4, false);

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 085c588ebfe08da6d4f0244a388a3f1f0eaa79d3..51c9f75f34b9bba7cf65d8c1e2e6032281ec6f30 100644 (file)
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -539,8 +539,8 @@ static int ipip6_err(struct sk_buff *skb, u32 info)
                goto out;
        }
        if (type == ICMP_REDIRECT) {
-               ipv4_redirect(skb, dev_net(skb->dev), t->parms.link, 0,
-                             iph->protocol, 0);
+               ipv4_redirect(skb, dev_net(skb->dev), t->parms.link,
+                             iph->protocol);
                err = 0;
                goto out;
        }

diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c
index 16bc5ecb7869beeaf79157284656e25441f602dc..4b4ef4f662d9d2e40a0bb8f35af47c59177ce31c 100644 (file)
--- a/net/xfrm/xfrm_interface.c
+++ b/net/xfrm/xfrm_interface.c
@@ -471,7 +471,7 @@ static int xfrmi4_err(struct sk_buff *skb, u32 info)
        if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH)
                ipv4_update_pmtu(skb, net, info, 0, protocol);
        else
-               ipv4_redirect(skb, net, 0, 0, protocol, 0);
+               ipv4_redirect(skb, net, 0, protocol);
        xfrm_state_put(x);
 
        return 0;