aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2008-10-08 05:35:01 -0400
committerPatrick McHardy <kaber@trash.net>2008-10-08 05:35:01 -0400
commitee999d8b9573df1b547aacdc6d79f86eb79c25cd (patch)
tree83585a40918ad1ebad17f4a0cfbf5486c02c64d7 /net/bridge
parent7e9c6eeb136a46dfd941852803b3a9dd78939b69 (diff)
netfilter: x_tables: use NFPROTO_* in extensions
Signed-off-by: Jan Engelhardt <jengelh@medozas.de> Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/netfilter/ebt_log.c6
-rw-r--r--net/bridge/netfilter/ebt_ulog.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c
index 3770cd8a7b3a..8b17c64bcd75 100644
--- a/net/bridge/netfilter/ebt_log.c
+++ b/net/bridge/netfilter/ebt_log.c
@@ -206,10 +206,10 @@ static void ebt_log(const struct sk_buff *skb, unsigned int hooknr,
206 li.u.log.logflags = info->bitmask; 206 li.u.log.logflags = info->bitmask;
207 207
208 if (info->bitmask & EBT_LOG_NFLOG) 208 if (info->bitmask & EBT_LOG_NFLOG)
209 nf_log_packet(PF_BRIDGE, hooknr, skb, in, out, &li, 209 nf_log_packet(NFPROTO_BRIDGE, hooknr, skb, in, out, &li,
210 "%s", info->prefix); 210 "%s", info->prefix);
211 else 211 else
212 ebt_log_packet(PF_BRIDGE, hooknr, skb, in, out, &li, 212 ebt_log_packet(NFPROTO_BRIDGE, hooknr, skb, in, out, &li,
213 info->prefix); 213 info->prefix);
214} 214}
215 215
@@ -234,7 +234,7 @@ static int __init ebt_log_init(void)
234 ret = ebt_register_watcher(&log); 234 ret = ebt_register_watcher(&log);
235 if (ret < 0) 235 if (ret < 0)
236 return ret; 236 return ret;
237 nf_log_register(PF_BRIDGE, &ebt_log_logger); 237 nf_log_register(NFPROTO_BRIDGE, &ebt_log_logger);
238 return 0; 238 return 0;
239} 239}
240 240
diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index c84bda61afba..3b1678cd66f1 100644
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -310,7 +310,7 @@ static int __init ebt_ulog_init(void)
310 netlink_kernel_release(ebtulognl); 310 netlink_kernel_release(ebtulognl);
311 311
312 if (ret == 0) 312 if (ret == 0)
313 nf_log_register(PF_BRIDGE, &ebt_ulog_logger); 313 nf_log_register(NFPROTO_BRIDGE, &ebt_ulog_logger);
314 314
315 return ret; 315 return ret;
316} 316}