diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-06-11 10:00:49 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-06-11 10:00:49 -0400 |
| commit | 36432dae73cf2c90a59b39c8df9fd8219272b005 (patch) | |
| tree | 660b9104305a809ec4fdeb295ca13d6e90790ecc /net/bridge/br_fdb.c | |
| parent | 440f0d588555892601cfe511728a0fc0c8204063 (diff) | |
| parent | bb400801c2f40bbd9a688818323ad09abfc4e581 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
Diffstat (limited to 'net/bridge/br_fdb.c')
| -rw-r--r-- | net/bridge/br_fdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index a48f5efdb6bf..cb3e97b93aeb 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c | |||
| @@ -398,7 +398,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, | |||
| 398 | if (unlikely(fdb->is_local)) { | 398 | if (unlikely(fdb->is_local)) { |
| 399 | if (net_ratelimit()) | 399 | if (net_ratelimit()) |
| 400 | printk(KERN_WARNING "%s: received packet with " | 400 | printk(KERN_WARNING "%s: received packet with " |
| 401 | " own address as source address\n", | 401 | "own address as source address\n", |
| 402 | source->dev->name); | 402 | source->dev->name); |
| 403 | } else { | 403 | } else { |
| 404 | /* fastpath: update of existing entry */ | 404 | /* fastpath: update of existing entry */ |