diff options
| author | popcornmix <popcornmix@gmail.com> | 2016-02-01 13:42:12 +0000 |
|---|---|---|
| committer | popcornmix <popcornmix@gmail.com> | 2016-02-01 13:42:12 +0000 |
| commit | 6330c27817186caf38fc80e467cf858d9dd167fd (patch) | |
| tree | 25bb35d10d081ce9ea38183ed0920354c139a1ce /net/bridge/br_stp_if.c | |
| parent | db37370d01c4f46c010ce666ce318fb385ac5fe7 (diff) | |
| parent | 2d5f6b0413359df065fd02d695c08bbc7d998bbd (diff) | |
Merge remote-tracking branch 'stable/linux-4.1.y' into rpi-4.1.yrpi-bootloader-1.20160202-1
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 7832d07f48f6..ce658abdc2c8 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -128,7 +128,10 @@ static void br_stp_start(struct net_bridge *br) char *argv[] = { BR_STP_PROG, br->dev->name, "start", NULL }; char *envp[] = { NULL }; - 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); |