diff options
author | Denis V. Lunev <den@openvz.org> | 2008-03-24 18:30:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-24 18:30:27 -0400 |
commit | 7a6adb92fe301c10ca4dbd0d9f2422f5880595e7 (patch) | |
tree | b2b82f828a6eeaa788ee1d378d45e612e4a6d527 /net/ipv4/ip_sockglue.c | |
parent | f2c4802b3fdfb0d9596d932ca2af0ef6f8d60491 (diff) |
[NETNS]: Add namespace parameter to ip_cmsg_send.
Pass the init_net there for now.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_sockglue.c')
-rw-r--r-- | net/ipv4/ip_sockglue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 1b86a50269bc..0857f2d042cd 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c | |||
@@ -163,7 +163,7 @@ void ip_cmsg_recv(struct msghdr *msg, struct sk_buff *skb) | |||
163 | ip_cmsg_recv_security(msg, skb); | 163 | ip_cmsg_recv_security(msg, skb); |
164 | } | 164 | } |
165 | 165 | ||
166 | int ip_cmsg_send(struct msghdr *msg, struct ipcm_cookie *ipc) | 166 | int ip_cmsg_send(struct net *net, struct msghdr *msg, struct ipcm_cookie *ipc) |
167 | { | 167 | { |
168 | int err; | 168 | int err; |
169 | struct cmsghdr *cmsg; | 169 | struct cmsghdr *cmsg; |
@@ -176,7 +176,7 @@ int ip_cmsg_send(struct msghdr *msg, struct ipcm_cookie *ipc) | |||
176 | switch (cmsg->cmsg_type) { | 176 | switch (cmsg->cmsg_type) { |
177 | case IP_RETOPTS: | 177 | case IP_RETOPTS: |
178 | err = cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr)); | 178 | err = cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr)); |
179 | err = ip_options_get(&init_net, &ipc->opt, CMSG_DATA(cmsg), err < 40 ? err : 40); | 179 | err = ip_options_get(net, &ipc->opt, CMSG_DATA(cmsg), err < 40 ? err : 40); |
180 | if (err) | 180 | if (err) |
181 | return err; | 181 | return err; |
182 | break; | 182 | break; |