stuartl/linux-mainline
1
0
Fork 0
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux synced 2025-09-22 08:25:31 +10:00
Code Issues Releases Wiki Activity

ipv6: Constify the sk parameter of several helper functions.

Browse Source 
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>
This commit is contained in:
Guillaume Nault 2023-07-11 15:06:21 +02:00 committed by David S. Miller
parent 8d6eba33a2
commit 5bc67a854c
4 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/icmpv6.h
View File

@ -85,12 +85,10 @@ extern void icmpv6_param_prob_reason(struct sk_buff *skb,
struct flowi6; struct flowi6;
struct in6_addr; struct in6_addr;
extern void icmpv6_flow_init(struct sock *sk,
struct flowi6 *fl6, void icmpv6_flow_init(const struct sock *sk, struct flowi6 *fl6, u8 type,
u8 type, const struct in6_addr *saddr,
const struct in6_addr *saddr, const struct in6_addr *daddr, int oif);
const struct in6_addr *daddr,
int oif);
static inline void icmpv6_param_prob(struct sk_buff *skb, u8 code, int pos) static inline void icmpv6_param_prob(struct sk_buff *skb, u8 code, int pos)
{ {

7
net/ipv6/datagram.c
View File

@ -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); 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); const struct inet_sock *inet = inet_sk(sk);
struct ipv6_pinfo *np = inet6_sk(sk); const struct ipv6_pinfo *np = inet6_sk(sk);
int oif = sk->sk_bound_dev_if; int oif = sk->sk_bound_dev_if;
memset(fl6, 0, sizeof(*fl6)); memset(fl6, 0, sizeof(*fl6));

6
net/ipv6/icmp.c
View File

@ -1034,11 +1034,9 @@ drop_no_count:
return 0; return 0;
} }
void icmpv6_flow_init(struct sock *sk, struct flowi6 *fl6, void icmpv6_flow_init(const struct sock *sk, struct flowi6 *fl6, u8 type,
u8 type,
const struct in6_addr *saddr, const struct in6_addr *saddr,
const struct in6_addr *daddr, const struct in6_addr *daddr, int oif)
int oif)
{ {
memset(fl6, 0, sizeof(*fl6)); memset(fl6, 0, sizeof(*fl6));
fl6->saddr = *saddr; fl6->saddr = *saddr;

8
net/ipv6/mcast.c
View File

@ -1699,11 +1699,9 @@ mld_scount(struct ifmcaddr6 *pmc, int type, int gdeleted, int sdeleted)
return scount; return scount;
} }
static void ip6_mc_hdr(struct sock *sk, struct sk_buff *skb, static void ip6_mc_hdr(const struct sock *sk, struct sk_buff *skb,
struct net_device *dev, struct net_device *dev, const struct in6_addr *saddr,
const struct in6_addr *saddr, const struct in6_addr *daddr, int proto, int len)
const struct in6_addr *daddr,
int proto, int len)
{ {
struct ipv6hdr *hdr; struct ipv6hdr *hdr;