VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / net / ipv6 / netfilter / ip6t_LOG.c

diff --git a/net/ipv6/netfilter/ip6t_LOG.c b/net/ipv6/netfilter/ip6t_LOG.c
index 97fe3a6..bb8590b 100644 (file)
--- a/net/ipv6/netfilter/ip6t_LOG.c
+++ b/net/ipv6/netfilter/ip6t_LOG.c
@@ -48,10 +48,10 @@ static spinlock_t log_lock = SPIN_LOCK_UNLOCKED;
 
 /* takes in current header and pointer to the header */
 /* if another header exists, sets hdrptr to the next header
-   and returns the new header value, else returns 0 */
+   and returns the new header value, else returns IPPROTO_NONE */
 static u_int8_t ip6_nexthdr(u_int8_t currenthdr, u_int8_t **hdrptr)
 {
-       u_int8_t hdrlen, nexthdr = 0;
+       u_int8_t hdrlen, nexthdr = IPPROTO_NONE;
 
        switch(currenthdr){
                case IPPROTO_AH:
@@ -77,7 +77,6 @@ static u_int8_t ip6_nexthdr(u_int8_t currenthdr, u_int8_t **hdrptr)
                        break;
        }       
        return nexthdr;
-
 }
 
 /* One level of recursion won't kill us */
@@ -101,7 +100,7 @@ static void dump_packet(const struct ip6t_log_info *info,
 
        fragment = 0;
        hdrptr = (u_int8_t *)(ipv6h + 1);
-       while (currenthdr) {
+       while (currenthdr != IPPROTO_NONE) {
                if ((currenthdr == IPPROTO_TCP) ||
                    (currenthdr == IPPROTO_UDP) ||
                    (currenthdr == IPPROTO_ICMPV6))
@@ -264,7 +263,7 @@ static void dump_packet(const struct ip6t_log_info *info,
                }
                break;
        }
-       /* Max length: 10 "PROTO 255 " */
+       /* Max length: 10 "PROTO=255 " */
        default:
                printk("PROTO=%u ", currenthdr);
        }