From: Denis V. Lunev <den@openvz.org>
Date: Wed, 26 Mar 2008 07:48:17 +0000 (-0700)
Subject: [NETNS]: Compilation warnings under CONFIG_NET_NS.
X-Git-Tag: v2.6.26-rc1~1138^2~314
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f5aa23fd49063745f85644dd7a9330acd706add6;p=~shefty%2Frdma-dev.git

[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: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 06ca84d71db..15fa84a15c2 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -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;
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index 07fe0d1a4f0..95c660c9719 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -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;
diff --git a/include/net/sock.h b/include/net/sock.h
index 7e0d4a0c4d1..1c9d059223e 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -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;