diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-13 14:14:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-13 14:14:10 -0700 |
| commit | e7874c996b8591f59d78efa519031dab5b58723b (patch) | |
| tree | 14aa8dea0c33de9d22ef8177fb242c9d80d693de /net/bridge/netfilter/ebt_log.c | |
| parent | 4a6346d4ea63b5e1390babf22f1cc0f113d8082b (diff) | |
| parent | 736d58e3a2245ac2779fe0f278f8735bcf33ca8d (diff) | |
| download | linux-3.10-e7874c996b8591f59d78efa519031dab5b58723b.tar.gz linux-3.10-e7874c996b8591f59d78efa519031dab5b58723b.tar.bz2 linux-3.10-e7874c996b8591f59d78efa519031dab5b58723b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/bridge/netfilter/ebt_log.c')
| -rw-r--r-- | net/bridge/netfilter/ebt_log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c index c4602415653..6e5a8bb9b94 100644 --- a/net/bridge/netfilter/ebt_log.c +++ b/net/bridge/netfilter/ebt_log.c @@ -171,7 +171,7 @@ out: } static unsigned int -ebt_log_tg(struct sk_buff *skb, const struct xt_target_param *par) +ebt_log_tg(struct sk_buff *skb, const struct xt_action_param *par) { const struct ebt_log_info *info = par->targinfo; struct nf_loginfo li; |