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

Minor overlapping changes in net/ipv4/ipmr.c, in 'net' we were
fixing the "BH-ness" of the counter bumps whilst in 'net-next'
the functions were modified to take an explicit 'net' parameter.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index aede704605c6..141c2a42d7ed 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -915,7 +915,7 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)
              nla_put(skb, IFLA_CAN_BITTIMING_CONST,
                      sizeof(*priv->bittiming_const), priv->bittiming_const)) ||
 
-            nla_put(skb, IFLA_CAN_CLOCK, sizeof(cm), &priv->clock) ||
+            nla_put(skb, IFLA_CAN_CLOCK, sizeof(priv->clock), &priv->clock) ||
             nla_put_u32(skb, IFLA_CAN_STATE, state) ||
             nla_put(skb, IFLA_CAN_CTRLMODE, sizeof(cm), &cm) ||
             nla_put_u32(skb, IFLA_CAN_RESTART_MS, priv->restart_ms) ||