Loading net/netfilter/xt_CONNMARK.c +29 −28 Original line number Diff line number Diff line Loading @@ -62,7 +62,8 @@ target(struct sk_buff **pskb, } break; case XT_CONNMARK_SAVE: newmark = (*ctmark & ~markinfo->mask) | ((*pskb)->nfmark & markinfo->mask); newmark = (*ctmark & ~markinfo->mask) | ((*pskb)->nfmark & markinfo->mask); if (*ctmark != newmark) { *ctmark = newmark; #ifdef CONFIG_IP_NF_CONNTRACK_EVENTS Loading Loading @@ -96,16 +97,16 @@ checkentry(const char *tablename, if (matchinfo->mode == XT_CONNMARK_RESTORE) { 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; } } if (matchinfo->mark > 0xffffffff || matchinfo->mask > 0xffffffff) { printk(KERN_WARNING "CONNMARK: Only supports 32bit mark\n"); return 0; } return 1; } Loading Loading
net/netfilter/xt_CONNMARK.c +29 −28 Original line number Diff line number Diff line Loading @@ -62,7 +62,8 @@ target(struct sk_buff **pskb, } break; case XT_CONNMARK_SAVE: newmark = (*ctmark & ~markinfo->mask) | ((*pskb)->nfmark & markinfo->mask); newmark = (*ctmark & ~markinfo->mask) | ((*pskb)->nfmark & markinfo->mask); if (*ctmark != newmark) { *ctmark = newmark; #ifdef CONFIG_IP_NF_CONNTRACK_EVENTS Loading Loading @@ -96,16 +97,16 @@ checkentry(const char *tablename, if (matchinfo->mode == XT_CONNMARK_RESTORE) { 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; } } if (matchinfo->mark > 0xffffffff || matchinfo->mask > 0xffffffff) { printk(KERN_WARNING "CONNMARK: Only supports 32bit mark\n"); return 0; } return 1; } Loading