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

Commit 8ec59b44 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'rebased-net-ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 955bd1d2 5c59e564

include/linux/inetdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static inline struct net_device *ip_dev_find(struct net *net, __be32 addr) 
}



int inet_addr_onlink(struct in_device *in_dev, __be32 a, __be32 b);

int devinet_ioctl(struct net *net, unsigned int cmd, void __user *);

int devinet_ioctl(struct net *net, unsigned int cmd, struct ifreq *);

void devinet_init(void);

struct in_device *inetdev_by_index(struct net *, int);

__be32 inet_select_addr(const struct net_device *dev, __be32 dst, int scope);

include/linux/net.h

+0 −1
Original line number Diff line number Diff line
@@ -306,7 +306,6 @@ int kernel_sendpage(struct socket *sock, struct page *page, int offset, 
		    size_t size, int flags);

int kernel_sendpage_locked(struct sock *sk, struct page *page, int offset,

			   size_t size, int flags);

int kernel_sock_ioctl(struct socket *sock, int cmd, unsigned long arg);

int kernel_sock_shutdown(struct socket *sock, enum sock_shutdown_cmd how);



/* Routine returns the IP overhead imposed by a (caller-protected) socket. */

include/linux/netdevice.h

+5 −2
Original line number Diff line number Diff line
@@ -2761,7 +2761,8 @@ static inline bool dev_validate_header(const struct net_device *dev, 
	return false;

}



typedef int gifconf_func_t(struct net_device * dev, char __user * bufptr, int len);

typedef int gifconf_func_t(struct net_device * dev, char __user * bufptr,

			   int len, int size);

int register_gifconf(unsigned int family, gifconf_func_t *gifconf);

static inline int unregister_gifconf(unsigned int family)

{
@@ -3314,7 +3315,9 @@ int netdev_rx_handler_register(struct net_device *dev, 
void netdev_rx_handler_unregister(struct net_device *dev);



bool dev_valid_name(const char *name);

int dev_ioctl(struct net *net, unsigned int cmd, void __user *);

int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr,

		bool *need_copyout);

int dev_ifconf(struct net *net, struct ifconf *, int);

int dev_ethtool(struct net *net, struct ifreq *);

unsigned int dev_get_flags(const struct net_device *);

int __dev_change_flags(struct net_device *, unsigned int flags);

include/net/route.h

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ unsigned int inet_addr_type_dev_table(struct net *net, 
				      const struct net_device *dev,

				      __be32 addr);

void ip_rt_multicast_event(struct in_device *);

int ip_rt_ioctl(struct net *, unsigned int cmd, void __user *arg);

int ip_rt_ioctl(struct net *, unsigned int cmd, struct rtentry *rt);

void ip_rt_get_source(u8 *src, struct sk_buff *skb, struct rtable *rt);

struct rtable *rt_dst_alloc(struct net_device *dev,

			     unsigned int flags, u16 type,

include/net/wext.h

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
struct net;



#ifdef CONFIG_WEXT_CORE

int wext_handle_ioctl(struct net *net, struct iwreq *iwr, unsigned int cmd,

int wext_handle_ioctl(struct net *net, unsigned int cmd,

		      void __user *arg);

int compat_wext_handle_ioctl(struct net *net, unsigned int cmd,

			     unsigned long arg);
@@ -15,7 +15,7 @@ int compat_wext_handle_ioctl(struct net *net, unsigned int cmd, 
struct iw_statistics *get_wireless_stats(struct net_device *dev);

int call_commit_handler(struct net_device *dev);

#else

static inline int wext_handle_ioctl(struct net *net, struct iwreq *iwr, unsigned int cmd,

static inline int wext_handle_ioctl(struct net *net, unsigned int cmd,

				    void __user *arg)

{

	return -EINVAL;