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

Conflicts:
	include/linux/netdevice.h
	net/core/sock.c

Trivial merge issues.

Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.

Two parallel line additions in net/core/sock.c

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

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
index f9cba4123c66..1870c4731a57 100644
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c
@@ -705,14 +705,14 @@ static size_t can_get_size(const struct net_device *dev)
         size_t size;
 
         size = nla_total_size(sizeof(u32));   /* IFLA_CAN_STATE */
-        size += sizeof(struct can_ctrlmode);  /* IFLA_CAN_CTRLMODE */
+        size += nla_total_size(sizeof(struct can_ctrlmode));  /* IFLA_CAN_CTRLMODE */
         size += nla_total_size(sizeof(u32));  /* IFLA_CAN_RESTART_MS */
-        size += sizeof(struct can_bittiming); /* IFLA_CAN_BITTIMING */
-        size += sizeof(struct can_clock);     /* IFLA_CAN_CLOCK */
+        size += nla_total_size(sizeof(struct can_bittiming)); /* IFLA_CAN_BITTIMING */
+        size += nla_total_size(sizeof(struct can_clock));     /* IFLA_CAN_CLOCK */
         if (priv->do_get_berr_counter)        /* IFLA_CAN_BERR_COUNTER */
-                size += sizeof(struct can_berr_counter);
+                size += nla_total_size(sizeof(struct can_berr_counter));
         if (priv->bittiming_const)            /* IFLA_CAN_BITTIMING_CONST */
-                size += sizeof(struct can_bittiming_const);
+                size += nla_total_size(sizeof(struct can_bittiming_const));
 
         return size;
 }