Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41135cc8 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

net: constify struct inet6_protocol 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 32613090

include/net/protocol.h

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ struct inet_protosw { 
extern const struct net_protocol *inet_protos[MAX_INET_PROTOS];



#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)

extern struct inet6_protocol *inet6_protos[MAX_INET_PROTOS];

extern const struct inet6_protocol *inet6_protos[MAX_INET_PROTOS];

#endif



extern int	inet_add_protocol(const struct net_protocol *prot, unsigned char num);
@@ -106,8 +106,8 @@ extern void inet_register_protosw(struct inet_protosw *p); 
extern void	inet_unregister_protosw(struct inet_protosw *p);



#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)

extern int	inet6_add_protocol(struct inet6_protocol *prot, unsigned char num);

extern int	inet6_del_protocol(struct inet6_protocol *prot, unsigned char num);

extern int	inet6_add_protocol(const struct inet6_protocol *prot, unsigned char num);

extern int	inet6_del_protocol(const struct inet6_protocol *prot, unsigned char num);

extern int	inet6_register_protosw(struct inet_protosw *p);

extern void	inet6_unregister_protosw(struct inet_protosw *p);

#endif

net/dccp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -1152,7 +1152,7 @@ static struct proto dccp_v6_prot = { 
#endif

};



static struct inet6_protocol dccp_v6_protocol = {

static const struct inet6_protocol dccp_v6_protocol = {

	.handler	= dccp_v6_rcv,

	.err_handler	= dccp_v6_err,

	.flags		= INET6_PROTO_NOPOLICY | INET6_PROTO_FINAL,

net/ipv6/af_inet6.c

+5 −5
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ EXPORT_SYMBOL_GPL(ipv6_opt_accepted); 


static int ipv6_gso_pull_exthdrs(struct sk_buff *skb, int proto)

{

	struct inet6_protocol *ops = NULL;

	const struct inet6_protocol *ops = NULL;



	for (;;) {

		struct ipv6_opt_hdr *opth;
@@ -745,7 +745,7 @@ static int ipv6_gso_pull_exthdrs(struct sk_buff *skb, int proto) 
static int ipv6_gso_send_check(struct sk_buff *skb)

{

	struct ipv6hdr *ipv6h;

	struct inet6_protocol *ops;

	const struct inet6_protocol *ops;

	int err = -EINVAL;



	if (unlikely(!pskb_may_pull(skb, sizeof(*ipv6h))))
@@ -773,7 +773,7 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb, int features) 
{

	struct sk_buff *segs = ERR_PTR(-EINVAL);

	struct ipv6hdr *ipv6h;

	struct inet6_protocol *ops;

	const struct inet6_protocol *ops;

	int proto;

	struct frag_hdr *fptr;

	unsigned int unfrag_ip6hlen;
@@ -840,7 +840,7 @@ struct ipv6_gro_cb { 
static struct sk_buff **ipv6_gro_receive(struct sk_buff **head,

					 struct sk_buff *skb)

{

	struct inet6_protocol *ops;

	const struct inet6_protocol *ops;

	struct sk_buff **pp = NULL;

	struct sk_buff *p;

	struct ipv6hdr *iph;
@@ -926,7 +926,7 @@ static struct sk_buff **ipv6_gro_receive(struct sk_buff **head, 


static int ipv6_gro_complete(struct sk_buff *skb)

{

	struct inet6_protocol *ops;

	const struct inet6_protocol *ops;

	struct ipv6hdr *iph = ipv6_hdr(skb);

	int err = -ENOSYS;

net/ipv6/ah6.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static const struct xfrm_type ah6_type = 
	.hdr_offset	= xfrm6_find_1stfragopt,

};



static struct inet6_protocol ah6_protocol = {

static const struct inet6_protocol ah6_protocol = {

	.handler	=	xfrm6_rcv,

	.err_handler	=	ah6_err,

	.flags		=	INET6_PROTO_NOPOLICY,

net/ipv6/esp6.c

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ static const struct xfrm_type esp6_type = 
	.hdr_offset	= xfrm6_find_1stfragopt,

};



static struct inet6_protocol esp6_protocol = {

static const struct inet6_protocol esp6_protocol = {

	.handler 	=	xfrm6_rcv,

	.err_handler	=	esp6_err,

	.flags		=	INET6_PROTO_NOPOLICY,