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

Commit f5aa23fd authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[NETNS]: Compilation warnings under CONFIG_NET_NS. 



Recent commits from YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
have been introduced a several compilation warnings
'assignment discards qualifiers from pointer target type'
due to extra const modifier in the inline call parameters of
{dev|sock|twsk}_net_set.

Drop it.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9c2f5746

include/linux/netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ struct net *dev_net(const struct net_device *dev) 
}



static inline

void dev_net_set(struct net_device *dev, const struct net *net)

void dev_net_set(struct net_device *dev, struct net *net)

{

#ifdef CONFIG_NET_NS

	dev->nd_net = net;

include/net/inet_timewait_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ struct net *twsk_net(const struct inet_timewait_sock *twsk) 
}



static inline

void twsk_net_set(struct inet_timewait_sock *twsk, const struct net *net)

void twsk_net_set(struct inet_timewait_sock *twsk, struct net *net)

{

#ifdef CONFIG_NET_NS

	twsk->tw_net = net;

include/net/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -1358,7 +1358,7 @@ struct net *sock_net(const struct sock *sk) 
}



static inline

void sock_net_set(struct sock *sk, const struct net *net)

void sock_net_set(struct sock *sk, struct net *net)

{

#ifdef CONFIG_NET_NS

	sk->sk_net = net;