aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/netfilter/ip6t_frag.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/netfilter/ip6t_frag.c')
-rw-r--r--net/ipv6/netfilter/ip6t_frag.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/net/ipv6/netfilter/ip6t_frag.c b/net/ipv6/netfilter/ip6t_frag.c
index e0e416bb284..65482af711d 100644
--- a/net/ipv6/netfilter/ip6t_frag.c
+++ b/net/ipv6/netfilter/ip6t_frag.c
@@ -77,35 +77,35 @@ match(const struct sk_buff *skb,
77 ntohl(fh->identification)); 77 ntohl(fh->identification));
78 78
79 DEBUGP("IPv6 FRAG id %02X ", 79 DEBUGP("IPv6 FRAG id %02X ",
80 (id_match(fraginfo->ids[0], fraginfo->ids[1], 80 id_match(fraginfo->ids[0], fraginfo->ids[1],
81 ntohl(fh->identification), 81 ntohl(fh->identification),
82 !!(fraginfo->invflags & IP6T_FRAG_INV_IDS)))); 82 !!(fraginfo->invflags & IP6T_FRAG_INV_IDS)));
83 DEBUGP("res %02X %02X%04X %02X ", 83 DEBUGP("res %02X %02X%04X %02X ",
84 (fraginfo->flags & IP6T_FRAG_RES), fh->reserved, 84 fraginfo->flags & IP6T_FRAG_RES, fh->reserved,
85 ntohs(fh->frag_off) & 0x6, 85 ntohs(fh->frag_off) & 0x6,
86 !((fraginfo->flags & IP6T_FRAG_RES) 86 !((fraginfo->flags & IP6T_FRAG_RES)
87 && (fh->reserved || (ntohs(fh->frag_off) & 0x06)))); 87 && (fh->reserved || (ntohs(fh->frag_off) & 0x06))));
88 DEBUGP("first %02X %02X %02X ", 88 DEBUGP("first %02X %02X %02X ",
89 (fraginfo->flags & IP6T_FRAG_FST), 89 fraginfo->flags & IP6T_FRAG_FST,
90 ntohs(fh->frag_off) & ~0x7, 90 ntohs(fh->frag_off) & ~0x7,
91 !((fraginfo->flags & IP6T_FRAG_FST) 91 !((fraginfo->flags & IP6T_FRAG_FST)
92 && (ntohs(fh->frag_off) & ~0x7))); 92 && (ntohs(fh->frag_off) & ~0x7)));
93 DEBUGP("mf %02X %02X %02X ", 93 DEBUGP("mf %02X %02X %02X ",
94 (fraginfo->flags & IP6T_FRAG_MF), 94 fraginfo->flags & IP6T_FRAG_MF,
95 ntohs(fh->frag_off) & IP6_MF, 95 ntohs(fh->frag_off) & IP6_MF,
96 !((fraginfo->flags & IP6T_FRAG_MF) 96 !((fraginfo->flags & IP6T_FRAG_MF)
97 && !((ntohs(fh->frag_off) & IP6_MF)))); 97 && !((ntohs(fh->frag_off) & IP6_MF))));
98 DEBUGP("last %02X %02X %02X\n", 98 DEBUGP("last %02X %02X %02X\n",
99 (fraginfo->flags & IP6T_FRAG_NMF), 99 fraginfo->flags & IP6T_FRAG_NMF,
100 ntohs(fh->frag_off) & IP6_MF, 100 ntohs(fh->frag_off) & IP6_MF,
101 !((fraginfo->flags & IP6T_FRAG_NMF) 101 !((fraginfo->flags & IP6T_FRAG_NMF)
102 && (ntohs(fh->frag_off) & IP6_MF))); 102 && (ntohs(fh->frag_off) & IP6_MF)));
103 103
104 return (fh != NULL) 104 return (fh != NULL)
105 && 105 &&
106 (id_match(fraginfo->ids[0], fraginfo->ids[1], 106 id_match(fraginfo->ids[0], fraginfo->ids[1],
107 ntohl(fh->identification), 107 ntohl(fh->identification),
108 !!(fraginfo->invflags & IP6T_FRAG_INV_IDS))) 108 !!(fraginfo->invflags & IP6T_FRAG_INV_IDS))
109 && 109 &&
110 !((fraginfo->flags & IP6T_FRAG_RES) 110 !((fraginfo->flags & IP6T_FRAG_RES)
111 && (fh->reserved || (ntohs(fh->frag_off) & 0x6))) 111 && (fh->reserved || (ntohs(fh->frag_off) & 0x6)))