ipvs: Clean up comment style in ip_vs.h

* Consistently use the multi-line comment style for networking code:

  /* This
   * That
   * The other thing
   */

* Use single-line comment style for comments with only one line of text.

* In general follow the leading '*' of each line of a comment with a
  single space and then text.

* Add missing line break between functions, remove double line break,
  align comments to previous lines whenever possible.

Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

1 files changed, 75 insertions, 139 deletions

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 576d7f0bed5d..615b20b58545 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -1,6 +1,5 @@
-/*
- *      IP Virtual Server
- *      data structure and functionality definitions
+/* IP Virtual Server
+ * data structure and functionality definitions
  */
 
 #ifndef _NET_IP_VS_H
@@ -12,7 +11,7 @@
 
 #include <linux/list.h>                 /* for struct list_head */
 #include <linux/spinlock.h>             /* for struct rwlock_t */
-#include <linux/atomic.h>                 /* for struct atomic_t */
+#include <linux/atomic.h>               /* for struct atomic_t */
 #include <linux/compiler.h>
 #include <linux/timer.h>
 #include <linux/bug.h>
@@ -30,15 +29,13 @@
 #endif
 #include <net/net_namespace.h>          /* Netw namespace */
 
-/*
- * Generic access of ipvs struct
- */
+/* Generic access of ipvs struct */
 static inline struct netns_ipvs *net_ipvs(struct net* net)
 {
         return net->ipvs;
 }
-/*
- * Get net ptr from skb in traffic cases
+
+/* Get net ptr from skb in traffic cases
  * use skb_sknet when call is from userland (ioctl or netlink)
  */
 static inline struct net *skb_net(const struct sk_buff *skb)
@@ -90,8 +87,8 @@ static inline struct net *skb_sknet(const struct sk_buff *skb)
         return &init_net;
 #endif
 }
-/*
- * This one needed for single_open_net since net is stored directly in
+
+/* This one needed for single_open_net since net is stored directly in
  * private not as a struct i.e. seq_file_net can't be used.
  */
 static inline struct net *seq_file_single_net(struct seq_file *seq)
@@ -108,7 +105,7 @@ extern int ip_vs_conn_tab_size;
 
 struct ip_vs_iphdr {
         __u32 len;      /* IPv4 simply where L4 starts
-                           IPv6 where L4 Transport Header starts */
+                         * IPv6 where L4 Transport Header starts */
         __u16 fragoffs; /* IPv6 fragment offset, 0 if first frag (or not frag)*/
         __s16 protocol;
         __s32 flags;
@@ -304,16 +301,11 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len,
 #define LeaveFunction(level)   do {} while (0)
 #endif
 
-
-/*
- *      The port number of FTP service (in network order).
- */
+/* The port number of FTP service (in network order). */
 #define FTPPORT  cpu_to_be16(21)
 #define FTPDATA  cpu_to_be16(20)
 
-/*
- *      TCP State Values
- */
+/* TCP State Values */
 enum {
         IP_VS_TCP_S_NONE = 0,
         IP_VS_TCP_S_ESTABLISHED,
@@ -329,25 +321,19 @@ enum {
         IP_VS_TCP_S_LAST
 };
 
-/*
- *      UDP State Values
- */
+/* UDP State Values */
 enum {
         IP_VS_UDP_S_NORMAL,
         IP_VS_UDP_S_LAST,
 };
 
-/*
- *      ICMP State Values
- */
+/* ICMP State Values */
 enum {
         IP_VS_ICMP_S_NORMAL,
         IP_VS_ICMP_S_LAST,
 };
 
-/*
- *      SCTP State Values
- */
+/* SCTP State Values */
 enum ip_vs_sctp_states {
         IP_VS_SCTP_S_NONE,
         IP_VS_SCTP_S_INIT1,
@@ -366,21 +352,18 @@ enum ip_vs_sctp_states {
         IP_VS_SCTP_S_LAST
 };
 
-/*
- *      Delta sequence info structure
- *      Each ip_vs_conn has 2 (output AND input seq. changes).
- *      Only used in the VS/NAT.
+/* Delta sequence info structure
+ * Each ip_vs_conn has 2 (output AND input seq. changes).
+ * Only used in the VS/NAT.
  */
 struct ip_vs_seq {
         __u32                   init_seq;       /* Add delta from this seq */
         __u32                   delta;          /* Delta in sequence numbers */
         __u32                   previous_delta; /* Delta in sequence numbers
-                                                   before last resized pkt */
+                                                 * before last resized pkt */
 };
 
-/*
- * counters per cpu
- */
+/* counters per cpu */
 struct ip_vs_counters {
         __u32           conns;          /* connections scheduled */
         __u32           inpkts;         /* incoming packets */
@@ -388,17 +371,13 @@ struct ip_vs_counters {
         __u64           inbytes;        /* incoming bytes */
         __u64           outbytes;       /* outgoing bytes */
 };
-/*
- * Stats per cpu
- */
+/* Stats per cpu */
 struct ip_vs_cpu_stats {
         struct ip_vs_counters   ustats;
         struct u64_stats_sync   syncp;
 };
 
-/*
- *      IPVS statistics objects
- */
+/* IPVS statistics objects */
 struct ip_vs_estimator {
         struct list_head        list;
 
@@ -491,9 +470,7 @@ struct ip_vs_protocol {
         void (*timeout_change)(struct ip_vs_proto_data *pd, int flags);
 };
 
-/*
- * protocol data per netns
- */
+/* protocol data per netns */
 struct ip_vs_proto_data {
         struct ip_vs_proto_data *next;
         struct ip_vs_protocol   *pp;
@@ -520,9 +497,7 @@ struct ip_vs_conn_param {
         __u8                            pe_data_len;
 };
 
-/*
- *      IP_VS structure allocated for each dynamically scheduled connection
- */
+/* IP_VS structure allocated for each dynamically scheduled connection */
 struct ip_vs_conn {