aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/core/rtnetlink.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 152744643074..adfb54b896da 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2570,7 +2570,7 @@ replay:
2570 return -ENODEV; 2570 return -ENODEV;
2571 } 2571 }
2572 2572
2573 if (tb[IFLA_MAP] || tb[IFLA_MASTER] || tb[IFLA_PROTINFO]) 2573 if (tb[IFLA_MAP] || tb[IFLA_PROTINFO])
2574 return -EOPNOTSUPP; 2574 return -EOPNOTSUPP;
2575 2575
2576 if (!ops) { 2576 if (!ops) {
@@ -2652,6 +2652,11 @@ replay:
2652 if (err < 0) 2652 if (err < 0)
2653 goto out_unregister; 2653 goto out_unregister;
2654 } 2654 }
2655 if (tb[IFLA_MASTER]) {
2656 err = do_set_master(dev, nla_get_u32(tb[IFLA_MASTER]));
2657 if (err)
2658 goto out_unregister;
2659 }
2655out: 2660out:
2656 if (link_net) 2661 if (link_net)
2657 put_net(link_net); 2662 put_net(link_net);