Skip to content

Commit 90528e6

Browse files
kaberDavid S. Miller
authored andcommitted
[NETFILTER]: xt_CONNMARK: use tabs for indentation
Signed-off-by: Patrick McHardy <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent da878c8 commit 90528e6

File tree

1 file changed

+29
-28
lines changed

1 file changed

+29
-28
lines changed

net/netfilter/xt_CONNMARK.c

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -49,36 +49,37 @@ target(struct sk_buff **pskb,
4949
u_int32_t *ctmark = nf_ct_get_mark(*pskb, &ctinfo);
5050

5151
if (ctmark) {
52-
switch(markinfo->mode) {
53-
case XT_CONNMARK_SET:
54-
newmark = (*ctmark & ~markinfo->mask) | markinfo->mark;
55-
if (newmark != *ctmark) {
56-
*ctmark = newmark;
52+
switch(markinfo->mode) {
53+
case XT_CONNMARK_SET:
54+
newmark = (*ctmark & ~markinfo->mask) | markinfo->mark;
55+
if (newmark != *ctmark) {
56+
*ctmark = newmark;
5757
#ifdef CONFIG_IP_NF_CONNTRACK_EVENTS
58-
ip_conntrack_event_cache(IPCT_MARK, *pskb);
58+
ip_conntrack_event_cache(IPCT_MARK, *pskb);
5959
#else
60-
nf_conntrack_event_cache(IPCT_MARK, *pskb);
60+
nf_conntrack_event_cache(IPCT_MARK, *pskb);
6161
#endif
6262
}
63-
break;
64-
case XT_CONNMARK_SAVE:
65-
newmark = (*ctmark & ~markinfo->mask) | ((*pskb)->nfmark & markinfo->mask);
66-
if (*ctmark != newmark) {
67-
*ctmark = newmark;
63+
break;
64+
case XT_CONNMARK_SAVE:
65+
newmark = (*ctmark & ~markinfo->mask) |
66+
((*pskb)->nfmark & markinfo->mask);
67+
if (*ctmark != newmark) {
68+
*ctmark = newmark;
6869
#ifdef CONFIG_IP_NF_CONNTRACK_EVENTS
69-
ip_conntrack_event_cache(IPCT_MARK, *pskb);
70+
ip_conntrack_event_cache(IPCT_MARK, *pskb);
7071
#else
71-
nf_conntrack_event_cache(IPCT_MARK, *pskb);
72+
nf_conntrack_event_cache(IPCT_MARK, *pskb);
7273
#endif
74+
}
75+
break;
76+
case XT_CONNMARK_RESTORE:
77+
nfmark = (*pskb)->nfmark;
78+
diff = (*ctmark ^ nfmark) & markinfo->mask;
79+
if (diff != 0)
80+
(*pskb)->nfmark = nfmark ^ diff;
81+
break;
7382
}
74-
break;
75-
case XT_CONNMARK_RESTORE:
76-
nfmark = (*pskb)->nfmark;
77-
diff = (*ctmark ^ nfmark) & markinfo->mask;
78-
if (diff != 0)
79-
(*pskb)->nfmark = nfmark ^ diff;
80-
break;
81-
}
8283
}
8384

8485
return XT_CONTINUE;
@@ -95,17 +96,17 @@ checkentry(const char *tablename,
9596
struct xt_connmark_target_info *matchinfo = targinfo;
9697

9798
if (matchinfo->mode == XT_CONNMARK_RESTORE) {
98-
if (strcmp(tablename, "mangle") != 0) {
99-
printk(KERN_WARNING "CONNMARK: restore can only be called from \"mangle\" table, not \"%s\"\n", tablename);
100-
return 0;
101-
}
99+
if (strcmp(tablename, "mangle") != 0) {
100+
printk(KERN_WARNING "CONNMARK: restore can only be "
101+
"called from \"mangle\" table, not \"%s\"\n",
102+
tablename);
103+
return 0;
104+
}
102105
}
103-
104106
if (matchinfo->mark > 0xffffffff || matchinfo->mask > 0xffffffff) {
105107
printk(KERN_WARNING "CONNMARK: Only supports 32bit mark\n");
106108
return 0;
107109
}
108-
109110
return 1;
110111
}
111112

0 commit comments

Comments
 (0)