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_netlink.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_netlink.c')
-rw-r--r-- | net/bridge/br_netlink.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index aa56ac2c8829..fe0a79018ab2 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c | |||
@@ -42,8 +42,8 @@ static int br_fill_ifinfo(struct sk_buff *skb, const struct net_bridge_port *por | |||
42 | struct nlmsghdr *nlh; | 42 | struct nlmsghdr *nlh; |
43 | u8 operstate = netif_running(dev) ? dev->operstate : IF_OPER_DOWN; | 43 | u8 operstate = netif_running(dev) ? dev->operstate : IF_OPER_DOWN; |
44 | 44 | ||
45 | pr_debug("br_fill_info event %d port %s master %s\n", | 45 | br_debug(br, "br_fill_info event %d port %s master %s\n", |
46 | event, dev->name, br->dev->name); | 46 | event, dev->name, br->dev->name); |
47 | 47 | ||
48 | nlh = nlmsg_put(skb, pid, seq, event, sizeof(*hdr), flags); | 48 | nlh = nlmsg_put(skb, pid, seq, event, sizeof(*hdr), flags); |
49 | if (nlh == NULL) | 49 | if (nlh == NULL) |
@@ -87,7 +87,9 @@ void br_ifinfo_notify(int event, struct net_bridge_port *port) | |||
87 | struct sk_buff *skb; | 87 | struct sk_buff *skb; |
88 | int err = -ENOBUFS; | 88 | int err = -ENOBUFS; |
89 | 89 | ||
90 | pr_debug("bridge notify event=%d\n", event); | 90 | br_debug(port->br, "port %u(%s) event %d\n", |
91 | (unsigned)port->port_no, port->dev->name, event); | ||
92 | |||
91 | skb = nlmsg_new(br_nlmsg_size(), GFP_ATOMIC); | 93 | skb = nlmsg_new(br_nlmsg_size(), GFP_ATOMIC); |
92 | if (skb == NULL) | 94 | if (skb == NULL) |
93 | goto errout; | 95 | goto errout; |