ipv4: Rearrange arguments to ip_rt_redirect()

Pass in the SKB rather than just the IP addresses, so that policy
and other aspects can reside in ip_rt_redirect() rather then
icmp_redirect().

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 30 deletions

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 588514627aa7..70a793559bb5 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -755,40 +755,16 @@ out_err:
 
 static void icmp_redirect(struct sk_buff *skb)
 {
-        const struct iphdr *iph;
-
-        if (skb->len < sizeof(struct iphdr))
-                goto out_err;
+        if (skb->len < sizeof(struct iphdr)) {
+                ICMP_INC_STATS_BH(dev_net(skb->dev), ICMP_MIB_INERRORS);
+                return;
+        }
 
-        /*
-         *      Get the copied header of the packet that caused the redirect
-         */
         if (!pskb_may_pull(skb, sizeof(struct iphdr)))
-                goto out;
-
-        iph = (const struct iphdr *)skb->data;
-
-        switch (icmp_hdr(skb)->code & 7) {
-        case ICMP_REDIR_NET:
-        case ICMP_REDIR_NETTOS:
-                /*
-                 * As per RFC recommendations now handle it as a host redirect.
-                 */
-        case ICMP_REDIR_HOST:
-        case ICMP_REDIR_HOSTTOS:
-                ip_rt_redirect(ip_hdr(skb)->saddr, iph->daddr,
-                               icmp_hdr(skb)->un.gateway,
-                               iph->saddr, skb->dev);
-                break;
-        }
+                return;
 
+        ip_rt_redirect(skb, icmp_hdr(skb)->un.gateway);
         icmp_socket_deliver(skb, icmp_hdr(skb)->un.gateway);
-
-out:
-        return;
-out_err:
-        ICMP_INC_STATS_BH(dev_net(skb->dev), ICMP_MIB_INERRORS);
-        goto out;
 }
 
 /*