diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-10-26 13:48:49 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-10-26 13:48:49 -0700 |
| commit | 2216773fc021964a413409141d439de4f6a108f7 (patch) | |
| tree | 7b2f8cdcdf5fb05d75bd92f0c8d9ac635ceec48c /net/bridge/br_netlink.c | |
| parent | 42ac8ca89aef66618e8ae2d6e48e3f523bfcd69d (diff) | |
| parent | af1bdb79ca64ceadc7b44b11929b384eff66ce59 (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebaselinux-linaro-3.1-2011.10-2-android-0
Diffstat (limited to 'net/bridge/br_netlink.c')
| -rw-r--r-- | net/bridge/br_netlink.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 5b1ed1ba9aa..e5f9ece3c9a 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -210,6 +210,7 @@ static struct rtnl_link_ops br_link_ops __read_mostly = { .priv_size = sizeof(struct net_bridge), .setup = br_dev_setup, .validate = br_validate, + .dellink = br_dev_delete, }; int __init br_netlink_init(void) |