diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-15 19:50:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-15 19:50:46 -0400 |
commit | d3502d7f25b22cfc9762bf1781faa9db1bb3be2e (patch) | |
tree | e1d0195704efaafa14caf6965c8f2b6b00cbcb83 /net/bridge | |
parent | d2a9a8ded48bec153f08ee87a40626c8d0737f79 (diff) | |
parent | 0a9f2a467d8dacaf7e97469dba99ed2d07287d80 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (53 commits)
[TCP]: Verify the presence of RETRANS bit when leaving FRTO
[IPV6]: Call inet6addr_chain notifiers on link down
[NET_SCHED]: Kill CONFIG_NET_CLS_POLICE
[NET_SCHED]: act_api: qdisc internal reclassify support
[NET_SCHED]: sch_dsmark: act_api support
[NET_SCHED]: sch_atm: act_api support
[NET_SCHED]: sch_atm: Lindent
[IPV6]: MSG_ERRQUEUE messages do not pass to connected raw sockets
[IPV4]: Cleanup call to __neigh_lookup()
[NET_SCHED]: Revert "avoid transmit softirq on watchdog wakeup" optimization
[NETFILTER]: nf_conntrack: UDPLITE support
[NETFILTER]: nf_conntrack: mark protocols __read_mostly
[NETFILTER]: x_tables: add connlimit match
[NETFILTER]: Lower *tables printk severity
[NETFILTER]: nf_conntrack: Don't track locally generated special ICMP error
[NETFILTER]: nf_conntrack: Introduces nf_ct_get_tuplepr and uses it
[NETFILTER]: nf_conntrack: make l3proto->prepare() generic and renames it
[NETFILTER]: nf_conntrack: Increment error count on parsing IPv4 header
[NET]: Add ethtool support for NETIF_F_IPV6_CSUM devices.
[AF_IUCV]: Add lock when updating accept_q
...
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/netfilter/ebtables.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index ac9984f98e59..4169a2a89a39 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c | |||
@@ -1525,14 +1525,14 @@ static int __init ebtables_init(void) | |||
1525 | if ((ret = nf_register_sockopt(&ebt_sockopts)) < 0) | 1525 | if ((ret = nf_register_sockopt(&ebt_sockopts)) < 0) |
1526 | return ret; | 1526 | return ret; |
1527 | 1527 | ||
1528 | printk(KERN_NOTICE "Ebtables v2.0 registered\n"); | 1528 | printk(KERN_INFO "Ebtables v2.0 registered\n"); |
1529 | return 0; | 1529 | return 0; |
1530 | } | 1530 | } |
1531 | 1531 | ||
1532 | static void __exit ebtables_fini(void) | 1532 | static void __exit ebtables_fini(void) |
1533 | { | 1533 | { |
1534 | nf_unregister_sockopt(&ebt_sockopts); | 1534 | nf_unregister_sockopt(&ebt_sockopts); |
1535 | printk(KERN_NOTICE "Ebtables v2.0 unregistered\n"); | 1535 | printk(KERN_INFO "Ebtables v2.0 unregistered\n"); |
1536 | } | 1536 | } |
1537 | 1537 | ||
1538 | EXPORT_SYMBOL(ebt_register_table); | 1538 | EXPORT_SYMBOL(ebt_register_table); |