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

This project is archived. Its data is read-only.

Commit 7a6adb92 authored Mar 24, 2008 by Denis V. Lunev Committed by David S. Miller Mar 24, 2008

[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>

parent f2c4802b

include/net/ip.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -362,7 +362,8 @@ extern int ip_options_rcv_srr(struct sk_buff *skb);
	*/		*/

	extern void ip_cmsg_recv(struct msghdr msg, struct sk_buff skb);		extern void ip_cmsg_recv(struct msghdr msg, struct sk_buff skb);
	extern int ip_cmsg_send(struct msghdr msg, struct ipcm_cookie ipc);		extern int ip_cmsg_send(struct net *net,
			struct msghdr msg, struct ipcm_cookie ipc);
	extern int ip_setsockopt(struct sock sk, int level, int optname, char __user optval, int optlen);		extern int ip_setsockopt(struct sock sk, int level, int optname, char __user optval, int optlen);
	extern int ip_getsockopt(struct sock sk, int level, int optname, char __user optval, int __user *optlen);		extern int ip_getsockopt(struct sock sk, int level, int optname, char __user optval, int __user *optlen);
	extern int compat_ip_setsockopt(struct sock *sk, int level,		extern int compat_ip_setsockopt(struct sock *sk, int level,

net/ipv4/ip_sockglue.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -163,7 +163,7 @@ void ip_cmsg_recv(struct msghdr msg, struct sk_buff skb)
	ip_cmsg_recv_security(msg, skb);		ip_cmsg_recv_security(msg, skb);
	}		}

	int ip_cmsg_send(struct msghdr msg, struct ipcm_cookie ipc)		int ip_cmsg_send(struct net net, struct msghdr msg, struct ipcm_cookie *ipc)
	{		{
	int err;		int err;
	struct cmsghdr *cmsg;		struct cmsghdr *cmsg;
	@@ -176,7 +176,7 @@ int ip_cmsg_send(struct msghdr msg, struct ipcm_cookie ipc)
	switch (cmsg->cmsg_type) {		switch (cmsg->cmsg_type) {
	case IP_RETOPTS:		case IP_RETOPTS:
	err = cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr));		err = cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr));
	err = ip_options_get(&init_net, &ipc->opt, CMSG_DATA(cmsg), err < 40 ? err : 40);		err = ip_options_get(net, &ipc->opt, CMSG_DATA(cmsg), err < 40 ? err : 40);
	if (err)		if (err)
	return err;		return err;
	break;		break;

net/ipv4/raw.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -499,7 +499,7 @@ static int raw_sendmsg(struct kiocb iocb, struct sock sk, struct msghdr *msg,
	ipc.oif = sk->sk_bound_dev_if;		ipc.oif = sk->sk_bound_dev_if;

	if (msg->msg_controllen) {		if (msg->msg_controllen) {
	err = ip_cmsg_send(msg, &ipc);		err = ip_cmsg_send(&init_net, msg, &ipc);
	if (err)		if (err)
	goto out;		goto out;
	if (ipc.opt)		if (ipc.opt)

net/ipv4/udp.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -607,7 +607,7 @@ int udp_sendmsg(struct kiocb iocb, struct sock sk, struct msghdr *msg,

	ipc.oif = sk->sk_bound_dev_if;		ipc.oif = sk->sk_bound_dev_if;
	if (msg->msg_controllen) {		if (msg->msg_controllen) {
	err = ip_cmsg_send(msg, &ipc);		err = ip_cmsg_send(&init_net, msg, &ipc);
	if (err)		if (err)
	return err;		return err;
	if (ipc.opt)		if (ipc.opt)