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 kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
net
/
bridge
/
netfilter
/
ebt_ulog.c
diff --git
a/net/bridge/netfilter/ebt_ulog.c
b/net/bridge/netfilter/ebt_ulog.c
index
136c525
..
a2ef7f8
100644
(file)
--- a/
net/bridge/netfilter/ebt_ulog.c
+++ b/
net/bridge/netfilter/ebt_ulog.c
@@
-29,7
+29,6
@@
*/
#include <linux/module.h>
*/
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/spinlock.h>
#include <linux/socket.h>
#include <linux/skbuff.h>
#include <linux/spinlock.h>
#include <linux/socket.h>
#include <linux/skbuff.h>
@@
-172,7
+171,7
@@
static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb,
if (ub->qlen == 1)
skb_set_timestamp(ub->skb, &pm->stamp);
pm->data_len = copy_len;
if (ub->qlen == 1)
skb_set_timestamp(ub->skb, &pm->stamp);
pm->data_len = copy_len;
- pm->mark = skb->
nf
mark;
+ pm->mark = skb->mark;
pm->hook = hooknr;
if (uloginfo->prefix != NULL)
strcpy(pm->prefix, uloginfo->prefix);
pm->hook = hooknr;
if (uloginfo->prefix != NULL)
strcpy(pm->prefix, uloginfo->prefix);
@@
-287,7
+286,7
@@
static struct nf_logger ebt_ulog_logger = {
.me = THIS_MODULE,
};
.me = THIS_MODULE,
};
-static int __init init(void)
+static int __init
ebt_ulog_
init(void)
{
int i, ret = 0;
{
int i, ret = 0;
@@
-322,7
+321,7
@@
static int __init init(void)
return ret;
}
return ret;
}
-static void __exit fini(void)
+static void __exit
ebt_ulog_
fini(void)
{
ebt_ulog_buff_t *ub;
int i;
{
ebt_ulog_buff_t *ub;
int i;
@@
-343,8
+342,8
@@
static void __exit fini(void)
sock_release(ebtulognl->sk_socket);
}
sock_release(ebtulognl->sk_socket);
}
-module_init(init);
-module_exit(fini);
+module_init(
ebt_ulog_
init);
+module_exit(
ebt_ulog_
fini);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Bart De Schuymer <bdschuym@pandora.be>");
MODULE_DESCRIPTION("ebtables userspace logging module for bridged Ethernet"
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Bart De Schuymer <bdschuym@pandora.be>");
MODULE_DESCRIPTION("ebtables userspace logging module for bridged Ethernet"