Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Just several instances of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 9023e3e3be0b..62f6a967a1b7 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -60,7 +60,7 @@ struct switchdev_attr {
                 struct netdev_phys_item_id ppid;        /* PORT_PARENT_ID */
                 u8 stp_state;                           /* PORT_STP_STATE */
                 unsigned long brport_flags;             /* PORT_BRIDGE_FLAGS */
-                u32 ageing_time;                        /* BRIDGE_AGEING_TIME */
+                clock_t ageing_time;                    /* BRIDGE_AGEING_TIME */
                 bool vlan_filtering;                    /* BRIDGE_VLAN_FILTERING */
         } u;
 };