diff options
| author | David S. Miller | 2016-01-01 00:20:10 +0100 |
|---|---|---|
| committer | David S. Miller | 2016-01-01 00:20:10 +0100 |
| commit | c07f30ad68053181b3e8a0e65b0630e12e844f91 (patch) | |
| tree | 8758968aabc844c435ff2a5d7d02c835fccd02a3 /net/bridge/br_stp_if.c | |
| parent | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | Merge tag 'pci-v4.4-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | kernel-qcow2-linux-c07f30ad68053181b3e8a0e65b0630e12e844f91.tar.gz kernel-qcow2-linux-c07f30ad68053181b3e8a0e65b0630e12e844f91.tar.xz kernel-qcow2-linux-c07f30ad68053181b3e8a0e65b0630e12e844f91.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 775e00fbeb1e..905cedd37a05 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -40,7 +40,7 @@ void br_init_port(struct net_bridge_port *p) .orig_dev = p->dev, .id = SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME, .flags = SWITCHDEV_F_SKIP_EOPNOTSUPP | SWITCHDEV_F_DEFER, - .u.ageing_time = p->br->ageing_time, + .u.ageing_time = jiffies_to_clock_t(p->br->ageing_time), }; int err; |