Merge remote-tracking branch 'spi/fix/core' into spi-linus

[firefly-linux-kernel-4.4.55.git] / net / bridge / br_ioctl.c

diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index 8d423bc649b9c4a2829499dffb0ba88d952af128..263b4de4de57ccf4beddbfc48e62967236450b9b 100644 (file)
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -200,8 +200,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
                if (!ns_capable(dev_net(dev)->user_ns, CAP_NET_ADMIN))
                        return -EPERM;
 
-               br->ageing_time = clock_t_to_jiffies(args[1]);
-               return 0;
+               return br_set_ageing_time(br, args[1]);
 
        case BRCTL_GET_PORT_INFO:
        {