diff options
| author | David S. Miller | 2016-01-07 04:54:18 +0100 |
|---|---|---|
| committer | David S. Miller | 2016-01-07 04:54:18 +0100 |
| commit | 9e0efaf6b41bf22c2eb81258fc2a6f1538a643e5 (patch) | |
| tree | e2daa5fb47f707f44b6b7e9da82a6d8017af3f8c /net/bridge/br_stp_if.c | |
| parent | net: Add eth_platform_get_mac_address() helper. (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-9e0efaf6b41bf22c2eb81258fc2a6f1538a643e5.tar.gz kernel-qcow2-linux-9e0efaf6b41bf22c2eb81258fc2a6f1538a643e5.tar.xz kernel-qcow2-linux-9e0efaf6b41bf22c2eb81258fc2a6f1538a643e5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/bridge/br_stp_if.c')
| -rw-r--r-- | net/bridge/br_stp_if.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 905cedd37a05..a31ac6ad76a2 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -143,7 +143,10 @@ static void br_stp_start(struct net_bridge *br) char *envp[] = { NULL }; struct net_bridge_port *p; - r = call_usermodehelper(BR_STP_PROG, argv, envp, UMH_WAIT_PROC); + if (net_eq(dev_net(br->dev), &init_net)) + r = call_usermodehelper(BR_STP_PROG, argv, envp, UMH_WAIT_PROC); + else + r = -ENOENT; spin_lock_bh(&br->lock); |