git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
netfilter
/
xt_connmark.c
diff --git
a/net/netfilter/xt_connmark.c
b/net/netfilter/xt_connmark.c
index
dc26a27
..
56324c8
100644
(file)
--- a/
net/netfilter/xt_connmark.c
+++ b/
net/netfilter/xt_connmark.c
@@
-58,7
+58,7
@@
checkentry(const char *tablename,
unsigned int matchsize,
unsigned int hook_mask)
{
unsigned int matchsize,
unsigned int hook_mask)
{
- struct xt_connmark_info *cm =
(struct xt_connmark_info *)
matchinfo;
+ struct xt_connmark_info *cm = matchinfo;
if (cm->mark > 0xffffffff || cm->mask > 0xffffffff) {
printk(KERN_WARNING "connmark: only support 32bit mark\n");
if (cm->mark > 0xffffffff || cm->mask > 0xffffffff) {
printk(KERN_WARNING "connmark: only support 32bit mark\n");