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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
net
/
bridge
/
netfilter
/
ebt_mark.c
diff --git
a/net/bridge/netfilter/ebt_mark.c
b/net/bridge/netfilter/ebt_mark.c
index
02c632b
..
770c0df
100644
(file)
--- a/
net/bridge/netfilter/ebt_mark.c
+++ b/
net/bridge/netfilter/ebt_mark.c
@@
-23,10
+23,9
@@
static int ebt_target_mark(struct sk_buff **pskb, unsigned int hooknr,
{
struct ebt_mark_t_info *info = (struct ebt_mark_t_info *)data;
{
struct ebt_mark_t_info *info = (struct ebt_mark_t_info *)data;
- if ((*pskb)->nfmark != info->mark)
{
+ if ((*pskb)->nfmark != info->mark)
(*pskb)->nfmark = info->mark;
(*pskb)->nfmark = info->mark;
- (*pskb)->nfcache |= NFC_ALTERED;
- }
+
return info->target;
}
return info->target;
}
@@
-53,16
+52,16
@@
static struct ebt_target mark_target =
.me = THIS_MODULE,
};
.me = THIS_MODULE,
};
-static int __init init(void)
+static int __init
ebt_mark_
init(void)
{
return ebt_register_target(&mark_target);
}
{
return ebt_register_target(&mark_target);
}
-static void __exit fini(void)
+static void __exit
ebt_mark_
fini(void)
{
ebt_unregister_target(&mark_target);
}
{
ebt_unregister_target(&mark_target);
}
-module_init(init);
-module_exit(fini);
+module_init(
ebt_mark_
init);
+module_exit(
ebt_mark_
fini);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");