Commit 53d3176b authored by Changli Gao's avatar Changli Gao Committed by David S. Miller

net: cleanups

remove useless blanks.
Signed-off-by: default avatarChangli Gao <xiaosuo@gmail.com>
----
 include/net/inet_common.h |   55 ++++-------
 include/net/tcp.h         |  222 +++++++++++++++++-----------------------------
 include/net/udp.h         |   38 +++----
 3 files changed, 123 insertions(+), 192 deletions(-)
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dbe000ed
#ifndef _INET_COMMON_H #ifndef _INET_COMMON_H
#define _INET_COMMON_H #define _INET_COMMON_H
extern const struct proto_ops inet_stream_ops; extern const struct proto_ops inet_stream_ops;
extern const struct proto_ops inet_dgram_ops; extern const struct proto_ops inet_dgram_ops;
/* /*
* INET4 prototypes used by INET6 * INET4 prototypes used by INET6
...@@ -13,37 +13,24 @@ struct sock; ...@@ -13,37 +13,24 @@ struct sock;
struct sockaddr; struct sockaddr;
struct socket; struct socket;
extern int inet_release(struct socket *sock); extern int inet_release(struct socket *sock);
extern int inet_stream_connect(struct socket *sock, extern int inet_stream_connect(struct socket *sock, struct sockaddr * uaddr,
struct sockaddr * uaddr, int addr_len, int flags);
int addr_len, int flags); extern int inet_dgram_connect(struct socket *sock, struct sockaddr * uaddr,
extern int inet_dgram_connect(struct socket *sock, int addr_len, int flags);
struct sockaddr * uaddr, extern int inet_accept(struct socket *sock, struct socket *newsock, int flags);
int addr_len, int flags); extern int inet_sendmsg(struct kiocb *iocb, struct socket *sock,
extern int inet_accept(struct socket *sock, struct msghdr *msg, size_t size);
struct socket *newsock, int flags); extern int inet_shutdown(struct socket *sock, int how);
extern int inet_sendmsg(struct kiocb *iocb, extern int inet_listen(struct socket *sock, int backlog);
struct socket *sock, extern void inet_sock_destruct(struct sock *sk);
struct msghdr *msg, extern int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len);
size_t size); extern int inet_getname(struct socket *sock, struct sockaddr *uaddr,
extern int inet_shutdown(struct socket *sock, int how); int *uaddr_len, int peer);
extern int inet_listen(struct socket *sock, int backlog); extern int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
extern int inet_ctl_sock_create(struct sock **sk, unsigned short family,
extern void inet_sock_destruct(struct sock *sk); unsigned short type, unsigned char protocol,
struct net *net);
extern int inet_bind(struct socket *sock,
struct sockaddr *uaddr, int addr_len);
extern int inet_getname(struct socket *sock,
struct sockaddr *uaddr,
int *uaddr_len, int peer);
extern int inet_ioctl(struct socket *sock,
unsigned int cmd, unsigned long arg);
extern int inet_ctl_sock_create(struct sock **sk,
unsigned short family,
unsigned short type,
unsigned char protocol,
struct net *net);
static inline void inet_ctl_sock_destroy(struct sock *sk) static inline void inet_ctl_sock_destroy(struct sock *sk)
{ {
...@@ -51,5 +38,3 @@ static inline void inet_ctl_sock_destroy(struct sock *sk) ...@@ -51,5 +38,3 @@ static inline void inet_ctl_sock_destroy(struct sock *sk)
} }
#endif #endif
This diff is collapsed.
...@@ -157,30 +157,28 @@ static inline void udp_lib_close(struct sock *sk, long timeout) ...@@ -157,30 +157,28 @@ static inline void udp_lib_close(struct sock *sk, long timeout)
sk_common_release(sk); sk_common_release(sk);
} }
extern int udp_lib_get_port(struct sock *sk, unsigned short snum, extern int udp_lib_get_port(struct sock *sk, unsigned short snum,
int (*)(const struct sock *,const struct sock *), int (*)(const struct sock *,const struct sock *),
unsigned int hash2_nulladdr); unsigned int hash2_nulladdr);
/* net/ipv4/udp.c */ /* net/ipv4/udp.c */
extern int udp_get_port(struct sock *sk, unsigned short snum, extern int udp_get_port(struct sock *sk, unsigned short snum,
int (*saddr_cmp)(const struct sock *, const struct sock *)); int (*saddr_cmp)(const struct sock *,
extern void udp_err(struct sk_buff *, u32); const struct sock *));
extern void udp_err(struct sk_buff *, u32);
extern int udp_sendmsg(struct kiocb *iocb, struct sock *sk, extern int udp_sendmsg(struct kiocb *iocb, struct sock *sk,
struct msghdr *msg, size_t len); struct msghdr *msg, size_t len);
extern void udp_flush_pending_frames(struct sock *sk); extern void udp_flush_pending_frames(struct sock *sk);
extern int udp_rcv(struct sk_buff *skb);
extern int udp_rcv(struct sk_buff *skb); extern int udp_ioctl(struct sock *sk, int cmd, unsigned long arg);
extern int udp_ioctl(struct sock *sk, int cmd, unsigned long arg); extern int udp_disconnect(struct sock *sk, int flags);
extern int udp_disconnect(struct sock *sk, int flags);
extern unsigned int udp_poll(struct file *file, struct socket *sock, extern unsigned int udp_poll(struct file *file, struct socket *sock,
poll_table *wait); poll_table *wait);
extern int udp_lib_getsockopt(struct sock *sk, int level, int optname, extern int udp_lib_getsockopt(struct sock *sk, int level, int optname,
char __user *optval, int __user *optlen); char __user *optval, int __user *optlen);
extern int udp_lib_setsockopt(struct sock *sk, int level, int optname, extern int udp_lib_setsockopt(struct sock *sk, int level, int optname,
char __user *optval, unsigned int optlen, char __user *optval, unsigned int optlen,
int (*push_pending_frames)(struct sock *)); int (*push_pending_frames)(struct sock *));
extern struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport, extern struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport,
__be32 daddr, __be16 dport, __be32 daddr, __be16 dport,
int dif); int dif);
...@@ -236,7 +234,7 @@ struct udp_iter_state { ...@@ -236,7 +234,7 @@ struct udp_iter_state {
extern int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo); extern int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo);
extern void udp_proc_unregister(struct net *net, struct udp_seq_afinfo *afinfo); extern void udp_proc_unregister(struct net *net, struct udp_seq_afinfo *afinfo);
extern int udp4_proc_init(void); extern int udp4_proc_init(void);
extern void udp4_proc_exit(void); extern void udp4_proc_exit(void);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment