From: David S. Miller <davem@davemloft.net>
Date: Thu, 31 Dec 2015 23:20:10 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.5-rc1~128^2~81
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c07f30ad68053181b3e8a0e65b0630e12e844f91;p=platform%2Fkernel%2Flinux-exynos.git

Merge git://git./linux/kernel/git/davem/net
---

c07f30ad68053181b3e8a0e65b0630e12e844f91
diff --cc net/bridge/br_stp_if.c
index 775e00f,12045de..905cedd
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@@ -37,10 -37,9 +37,10 @@@ static inline port_id br_make_port_id(_
  void br_init_port(struct net_bridge_port *p)
  {
  	struct switchdev_attr attr = {
 +		.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;