Commit 3e7a1c7c authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

ip_tunnel: use ndo_siocdevprivate 



The various ipv4 and ipv6 tunnel drivers each implement a set
of 12 SIOCDEVPRIVATE commands for managing tunnels. These
all work correctly in compat mode.

Move them over to the new .ndo_siocdevprivate operation.

Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: David Ahern <dsahern@kernel.org>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae6af012

include/net/ip_tunnels.h

+2 −1
Original line number Diff line number Diff line
@@ -270,7 +270,8 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, 
void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,

		       const u8 proto, int tunnel_hlen);

int ip_tunnel_ctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd);

int ip_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);

int ip_tunnel_siocdevprivate(struct net_device *dev, struct ifreq *ifr,

			     void __user *data, int cmd);

int __ip_tunnel_change_mtu(struct net_device *dev, int new_mtu, bool strict);

int ip_tunnel_change_mtu(struct net_device *dev, int new_mtu);

net/ipv4/ip_gre.c

+1 −1
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ static const struct net_device_ops ipgre_netdev_ops = { 
	.ndo_stop		= ipgre_close,

#endif

	.ndo_start_xmit		= ipgre_xmit,

	.ndo_do_ioctl		= ip_tunnel_ioctl,

	.ndo_siocdevprivate	= ip_tunnel_siocdevprivate,

	.ndo_change_mtu		= ip_tunnel_change_mtu,

	.ndo_get_stats64	= dev_get_tstats64,

	.ndo_get_iflink		= ip_tunnel_get_iflink,

net/ipv4/ip_tunnel.c

+5 −4
Original line number Diff line number Diff line
@@ -958,19 +958,20 @@ int ip_tunnel_ctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd) 
}

EXPORT_SYMBOL_GPL(ip_tunnel_ctl);



int ip_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)

int ip_tunnel_siocdevprivate(struct net_device *dev, struct ifreq *ifr,

			     void __user *data, int cmd)

{

	struct ip_tunnel_parm p;

	int err;



	if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof(p)))

	if (copy_from_user(&p, data, sizeof(p)))

		return -EFAULT;

	err = dev->netdev_ops->ndo_tunnel_ctl(dev, &p, cmd);

	if (!err && copy_to_user(ifr->ifr_ifru.ifru_data, &p, sizeof(p)))

	if (!err && copy_to_user(data, &p, sizeof(p)))

		return -EFAULT;

	return err;

}

EXPORT_SYMBOL_GPL(ip_tunnel_ioctl);

EXPORT_SYMBOL_GPL(ip_tunnel_siocdevprivate);



int __ip_tunnel_change_mtu(struct net_device *dev, int new_mtu, bool strict)

{

net/ipv4/ip_vti.c

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static const struct net_device_ops vti_netdev_ops = { 
	.ndo_init	= vti_tunnel_init,

	.ndo_uninit	= ip_tunnel_uninit,

	.ndo_start_xmit	= vti_tunnel_xmit,

	.ndo_do_ioctl	= ip_tunnel_ioctl,

	.ndo_siocdevprivate = ip_tunnel_siocdevprivate,

	.ndo_change_mtu	= ip_tunnel_change_mtu,

	.ndo_get_stats64 = dev_get_tstats64,

	.ndo_get_iflink = ip_tunnel_get_iflink,

net/ipv4/ipip.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ static const struct net_device_ops ipip_netdev_ops = { 
	.ndo_init       = ipip_tunnel_init,

	.ndo_uninit     = ip_tunnel_uninit,

	.ndo_start_xmit	= ipip_tunnel_xmit,

	.ndo_do_ioctl	= ip_tunnel_ioctl,

	.ndo_siocdevprivate = ip_tunnel_siocdevprivate,

	.ndo_change_mtu = ip_tunnel_change_mtu,

	.ndo_get_stats64 = dev_get_tstats64,

	.ndo_get_iflink = ip_tunnel_get_iflink,