net: remove the duplicate #ifdef __KERNEL__
Since we are already in #ifdef __KERNEL__, we don't need to check it again. Signed-off-by: Changli Gao <xiaosuo@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f88de8de5a
commit
2ad0d9d413
|
@ -30,12 +30,10 @@ struct cred;
|
||||||
#define __sockaddr_check_size(size) \
|
#define __sockaddr_check_size(size) \
|
||||||
BUILD_BUG_ON(((size) > sizeof(struct __kernel_sockaddr_storage)))
|
BUILD_BUG_ON(((size) > sizeof(struct __kernel_sockaddr_storage)))
|
||||||
|
|
||||||
#ifdef __KERNEL__
|
#ifdef CONFIG_PROC_FS
|
||||||
# ifdef CONFIG_PROC_FS
|
|
||||||
struct seq_file;
|
struct seq_file;
|
||||||
extern void socket_seq_show(struct seq_file *seq);
|
extern void socket_seq_show(struct seq_file *seq);
|
||||||
# endif
|
#endif
|
||||||
#endif /* __KERNEL__ */
|
|
||||||
|
|
||||||
typedef unsigned short sa_family_t;
|
typedef unsigned short sa_family_t;
|
||||||
|
|
||||||
|
@ -311,7 +309,6 @@ struct ucred {
|
||||||
/* IPX options */
|
/* IPX options */
|
||||||
#define IPX_TYPE 1
|
#define IPX_TYPE 1
|
||||||
|
|
||||||
#ifdef __KERNEL__
|
|
||||||
extern void cred_to_ucred(struct pid *pid, const struct cred *cred, struct ucred *ucred);
|
extern void cred_to_ucred(struct pid *pid, const struct cred *cred, struct ucred *ucred);
|
||||||
|
|
||||||
extern int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len);
|
extern int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len);
|
||||||
|
@ -333,6 +330,5 @@ struct timespec;
|
||||||
|
|
||||||
extern int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
|
extern int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
|
||||||
unsigned int flags, struct timespec *timeout);
|
unsigned int flags, struct timespec *timeout);
|
||||||
#endif
|
|
||||||
#endif /* not kernel and not glibc */
|
#endif /* not kernel and not glibc */
|
||||||
#endif /* _LINUX_SOCKET_H */
|
#endif /* _LINUX_SOCKET_H */
|
||||||
|
|
Loading…
Reference in a new issue