ipv6: Constify the sk parameter of several helper functions.

icmpv6_flow_init(), ip6_datagram_flow_key_init() and ip6_mc_hdr() don't
need to modify their sk argument. Make that explicit using const.

Signed-off-by: Guillaume Nault <gnault@redhat.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h
index db0f4fc..e3b3b0f 100644 (file)
--- a/include/linux/icmpv6.h
+++ b/include/linux/icmpv6.h
@@ -85,12 +85,10 @@ extern void                         icmpv6_param_prob_reason(struct sk_buff *skb,
 
 struct flowi6;
 struct in6_addr;
-extern void                            icmpv6_flow_init(struct sock *sk,
-                                                        struct flowi6 *fl6,
-                                                        u8 type,
-                                                        const struct in6_addr *saddr,
-                                                        const struct in6_addr *daddr,
-                                                        int oif);
+
+void icmpv6_flow_init(const struct sock *sk, struct flowi6 *fl6, u8 type,
+                     const struct in6_addr *saddr,
+                     const struct in6_addr *daddr, int oif);
 
 static inline void icmpv6_param_prob(struct sk_buff *skb, u8 code, int pos)
 {

diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 9b68184..d80d602 100644 (file)
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -38,10 +38,11 @@ static bool ipv6_mapped_addr_any(const struct in6_addr *a)
        return ipv6_addr_v4mapped(a) && (a->s6_addr32[3] == 0);
 }
 
-static void ip6_datagram_flow_key_init(struct flowi6 *fl6, struct sock *sk)
+static void ip6_datagram_flow_key_init(struct flowi6 *fl6,
+                                      const struct sock *sk)
 {
-       struct inet_sock *inet = inet_sk(sk);
-       struct ipv6_pinfo *np = inet6_sk(sk);
+       const struct inet_sock *inet = inet_sk(sk);
+       const struct ipv6_pinfo *np = inet6_sk(sk);
        int oif = sk->sk_bound_dev_if;
 
        memset(fl6, 0, sizeof(*fl6));

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 65fa501..6d88f52 100644 (file)
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -1034,11 +1034,9 @@ drop_no_count:
        return 0;
 }
 
-void icmpv6_flow_init(struct sock *sk, struct flowi6 *fl6,
-                     u8 type,
+void icmpv6_flow_init(const struct sock *sk, struct flowi6 *fl6, u8 type,
                      const struct in6_addr *saddr,
-                     const struct in6_addr *daddr,
-                     int oif)
+                     const struct in6_addr *daddr, int oif)
 {
        memset(fl6, 0, sizeof(*fl6));
        fl6->saddr = *saddr;

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 714cdc9..5ce25bc 100644 (file)
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -1699,11 +1699,9 @@ mld_scount(struct ifmcaddr6 *pmc, int type, int gdeleted, int sdeleted)
        return scount;
 }
 
-static void ip6_mc_hdr(struct sock *sk, struct sk_buff *skb,
-                      struct net_device *dev,
-                      const struct in6_addr *saddr,
-                      const struct in6_addr *daddr,
-                      int proto, int len)
+static void ip6_mc_hdr(const struct sock *sk, struct sk_buff *skb,
+                      struct net_device *dev, const struct in6_addr *saddr,
+                      const struct in6_addr *daddr, int proto, int len)
 {
        struct ipv6hdr *hdr;