iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[NETFILTER]: xt_CONNMARK: use tabs for indentation

Browse Source 
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2006-08-22 00:33:26 -07:00 committed by David S. Miller
parent da878c8e5a
commit 90528e6fe9
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/netfilter/xt_CONNMARK.c
View File

@ -62,7 +62,8 @@ target(struct sk_buff **pskb,
} }
break; break;
case XT_CONNMARK_SAVE: case XT_CONNMARK_SAVE:
newmark = (*ctmark & ~markinfo->mask) | ((*pskb)->nfmark & markinfo->mask); newmark = (*ctmark & ~markinfo->mask) |
((*pskb)->nfmark & markinfo->mask);
if (*ctmark != newmark) { if (*ctmark != newmark) {
*ctmark = newmark; *ctmark = newmark;
#ifdef CONFIG_IP_NF_CONNTRACK_EVENTS #ifdef CONFIG_IP_NF_CONNTRACK_EVENTS
@ -96,16 +97,16 @@ checkentry(const char *tablename,
if (matchinfo->mode == XT_CONNMARK_RESTORE) { if (matchinfo->mode == XT_CONNMARK_RESTORE) {
if (strcmp(tablename, "mangle") != 0) { if (strcmp(tablename, "mangle") != 0) {
printk(KERN_WARNING "CONNMARK: restore can only be called from \"mangle\" table, not \"%s\"\n", tablename); printk(KERN_WARNING "CONNMARK: restore can only be "
"called from \"mangle\" table, not \"%s\"\n",
tablename);
return 0; return 0;
} }
} }
if (matchinfo->mark > 0xffffffff || matchinfo->mask > 0xffffffff) { if (matchinfo->mark > 0xffffffff || matchinfo->mask > 0xffffffff) {
printk(KERN_WARNING "CONNMARK: Only supports 32bit mark\n"); printk(KERN_WARNING "CONNMARK: Only supports 32bit mark\n");
return 0; return 0;
} }
return 1; return 1;
} }