[NETFILTER]: Nicer names for ipt_connbytes constants

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 9 insertions, 9 deletions

diff --git a/include/linux/netfilter_ipv4/ipt_connbytes.h b/include/linux/netfilter_ipv4/ipt_connbytes.h
index abaa65afd4e9..9e5532f8d8ac 100644
--- a/include/linux/netfilter_ipv4/ipt_connbytes.h
+++ b/include/linux/netfilter_ipv4/ipt_connbytes.h
@@ -2,9 +2,9 @@
 #define _IPT_CONNBYTES_H
 
 enum ipt_connbytes_what {
-        IPT_CONNBYTES_WHAT_PKTS,
-        IPT_CONNBYTES_WHAT_BYTES,
-        IPT_CONNBYTES_WHAT_AVGPKT,
+        IPT_CONNBYTES_PKTS,
+        IPT_CONNBYTES_BYTES,
+        IPT_CONNBYTES_AVGPKT,
 };
 
 enum ipt_connbytes_direction {
diff --git a/net/ipv4/netfilter/ipt_connbytes.c b/net/ipv4/netfilter/ipt_connbytes.c
index 47128c073d85..df4a42c6da22 100644
--- a/net/ipv4/netfilter/ipt_connbytes.c
+++ b/net/ipv4/netfilter/ipt_connbytes.c
@@ -54,7 +54,7 @@ match(const struct sk_buff *skb,
                 return 0; /* no match */
 
         switch (sinfo->what) {
-        case IPT_CONNBYTES_WHAT_PKTS:
+        case IPT_CONNBYTES_PKTS:
                 switch (sinfo->direction) {
                 case IPT_CONNBYTES_DIR_ORIGINAL:
                         what = ct->counters[IP_CT_DIR_ORIGINAL].packets;
@@ -68,7 +68,7 @@ match(const struct sk_buff *skb,
                         break;
                 }
                 break;
-        case IPT_CONNBYTES_WHAT_BYTES:
+        case IPT_CONNBYTES_BYTES:
                 switch (sinfo->direction) {
                 case IPT_CONNBYTES_DIR_ORIGINAL:
                         what = ct->counters[IP_CT_DIR_ORIGINAL].bytes;
@@ -82,7 +82,7 @@ match(const struct sk_buff *skb,
                         break;
                 }
                 break;
-        case IPT_CONNBYTES_WHAT_AVGPKT:
+        case IPT_CONNBYTES_AVGPKT:
                 switch (sinfo->direction) {
                 case IPT_CONNBYTES_DIR_ORIGINAL:
                         what = div64_64(ct->counters[IP_CT_DIR_ORIGINAL].bytes,
@@ -128,9 +128,9 @@ static int check(const char *tablename,
         if (matchsize != IPT_ALIGN(sizeof(struct ipt_connbytes_info)))
                 return 0;
 
-        if (sinfo->what != IPT_CONNBYTES_WHAT_PKTS &&
-            sinfo->what != IPT_CONNBYTES_WHAT_BYTES &&
-            sinfo->what != IPT_CONNBYTES_WHAT_AVGPKT)
+        if (sinfo->what != IPT_CONNBYTES_PKTS &&
+            sinfo->what != IPT_CONNBYTES_BYTES &&
+            sinfo->what != IPT_CONNBYTES_AVGPKT)
                 return 0;
 
         if (sinfo->direction != IPT_CONNBYTES_DIR_ORIGINAL &&