diff options
author | stephen hemminger <shemminger@vyatta.com> | 2010-05-10 05:31:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-16 02:10:02 -0400 |
commit | 28a16c97963d3bc36a2c192859f6d8025ef2967a (patch) | |
tree | 01d21938502412959c88757df973cc5a770d1cce /net/bridge/br_fdb.c | |
parent | cfb478da70f2213520866c84cb0aea0d7c0e1148 (diff) |
bridge: change console message interface
Use one set of macro's for all bridge messages.
Note: can't use netdev_XXX macro's because bridge is purely
virtual and has no device parent.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_fdb.c')
-rw-r--r-- | net/bridge/br_fdb.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 9101a4e56201..26637439965b 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c | |||
@@ -353,8 +353,7 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source, | |||
353 | */ | 353 | */ |
354 | if (fdb->is_local) | 354 | if (fdb->is_local) |
355 | return 0; | 355 | return 0; |
356 | 356 | br_warn(br, "adding interface %s with same address " | |
357 | printk(KERN_WARNING "%s adding interface with same address " | ||
358 | "as a received packet\n", | 357 | "as a received packet\n", |
359 | source->dev->name); | 358 | source->dev->name); |
360 | fdb_delete(fdb); | 359 | fdb_delete(fdb); |
@@ -397,9 +396,9 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, | |||
397 | /* attempt to update an entry for a local interface */ | 396 | /* attempt to update an entry for a local interface */ |
398 | if (unlikely(fdb->is_local)) { | 397 | if (unlikely(fdb->is_local)) { |
399 | if (net_ratelimit()) | 398 | if (net_ratelimit()) |
400 | printk(KERN_WARNING "%s: received packet with " | 399 | br_warn(br, "received packet on %s with " |
401 | "own address as source address\n", | 400 | "own address as source address\n", |
402 | source->dev->name); | 401 | source->dev->name); |
403 | } else { | 402 | } else { |
404 | /* fastpath: update of existing entry */ | 403 | /* fastpath: update of existing entry */ |
405 | fdb->dst = source; | 404 | fdb->dst = source; |