Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...

[karo-tx-linux.git] / include / net / udp.h

diff --git a/include/net/udp.h b/include/net/udp.h
index 5348d80b25bb8a0593c9f0a80f42c4a6b2aeebc9..7abdf305da50fad63880b12c2c76a69b6b74a5fd 100644 (file)
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -157,30 +157,28 @@ static inline void udp_lib_close(struct sock *sk, long timeout)
        sk_common_release(sk);
 }
 
-extern int     udp_lib_get_port(struct sock *sk, unsigned short snum,
-               int (*)(const struct sock *,const struct sock *),
-               unsigned int hash2_nulladdr);
+extern int udp_lib_get_port(struct sock *sk, unsigned short snum,
+                           int (*)(const struct sock *,const struct sock *),
+                           unsigned int hash2_nulladdr);
 
 /* net/ipv4/udp.c */
-extern int     udp_get_port(struct sock *sk, unsigned short snum,
-                            int (*saddr_cmp)(const struct sock *, const struct sock *));
-extern void    udp_err(struct sk_buff *, u32);
-
-extern int     udp_sendmsg(struct kiocb *iocb, struct sock *sk,
+extern int udp_get_port(struct sock *sk, unsigned short snum,
+                       int (*saddr_cmp)(const struct sock *,
+                                        const struct sock *));
+extern void udp_err(struct sk_buff *, u32);
+extern int udp_sendmsg(struct kiocb *iocb, struct sock *sk,
                            struct msghdr *msg, size_t len);
-extern void    udp_flush_pending_frames(struct sock *sk);
-
-extern int     udp_rcv(struct sk_buff *skb);
-extern int     udp_ioctl(struct sock *sk, int cmd, unsigned long arg);
-extern int     udp_disconnect(struct sock *sk, int flags);
+extern void udp_flush_pending_frames(struct sock *sk);
+extern int udp_rcv(struct sk_buff *skb);
+extern int udp_ioctl(struct sock *sk, int cmd, unsigned long arg);
+extern int udp_disconnect(struct sock *sk, int flags);
 extern unsigned int udp_poll(struct file *file, struct socket *sock,
                             poll_table *wait);
-extern int     udp_lib_getsockopt(struct sock *sk, int level, int optname,
-                                  char __user *optval, int __user *optlen);
-extern int     udp_lib_setsockopt(struct sock *sk, int level, int optname,
-                                  char __user *optval, unsigned int optlen,
-                                  int (*push_pending_frames)(struct sock *));
-
+extern int udp_lib_getsockopt(struct sock *sk, int level, int optname,
+                             char __user *optval, int __user *optlen);
+extern int udp_lib_setsockopt(struct sock *sk, int level, int optname,
+                             char __user *optval, unsigned int optlen,
+                             int (*push_pending_frames)(struct sock *));
 extern struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport,
                                    __be32 daddr, __be16 dport,
                                    int dif);
@@ -236,7 +234,7 @@ struct udp_iter_state {
 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 int  udp4_proc_init(void);
+extern int udp4_proc_init(void);
 extern void udp4_proc_exit(void);
 #endif