diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-07 06:38:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-07 06:38:41 -0400 |
| commit | 242898be7a1921f646ca529ddc26d7337c69922f (patch) | |
| tree | 674adf64ca6254318dab5bcd428ebe8ac73957ff /net/bridge | |
| parent | 6bbad18a8b18228fa65d73547dfd5efad1515ef8 (diff) | |
| parent | 9f737633e6ee54fc174282d49b2559bd2208391d (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 06abb6634f5b..53086fb75089 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c | |||
| @@ -85,7 +85,7 @@ void br_ifinfo_notify(int event, struct net_bridge_port *port) | |||
| 85 | goto err_out; | 85 | goto err_out; |
| 86 | 86 | ||
| 87 | err = br_fill_ifinfo(skb, port, current->pid, 0, event, 0); | 87 | err = br_fill_ifinfo(skb, port, current->pid, 0, event, 0); |
| 88 | if (err) | 88 | if (err < 0) |
| 89 | goto err_kfree; | 89 | goto err_kfree; |
| 90 | 90 | ||
| 91 | NETLINK_CB(skb).dst_group = RTNLGRP_LINK; | 91 | NETLINK_CB(skb).dst_group = RTNLGRP_LINK; |