Commit 2175d87c authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

libnl: nla_put_msecs(): align on a 64-bit area 



nla_data() is now aligned on a 64-bit area.

Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 756a2f59

include/net/netlink.h

+7 −4
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ 
 *               padattr)		add s64 attribute to skb

 *   nla_put_string(skb, type, str)	add string attribute to skb

 *   nla_put_flag(skb, type)		add flag attribute to skb

 *   nla_put_msecs(skb, type, jiffies)	add msecs attribute to skb

 *   nla_put_msecs(skb, type, jiffies,

 *                 padattr)		add msecs attribute to skb

 *   nla_put_in_addr(skb, type, addr)	add IPv4 address attribute to skb

 *   nla_put_in6_addr(skb, type, addr)	add IPv6 address attribute to skb

 *
@@ -965,16 +966,18 @@ static inline int nla_put_flag(struct sk_buff *skb, int attrtype) 
}



/**

 * nla_put_msecs - Add a msecs netlink attribute to a socket buffer

 * nla_put_msecs - Add a msecs netlink attribute to a skb and align it

 * @skb: socket buffer to add attribute to

 * @attrtype: attribute type

 * @njiffies: number of jiffies to convert to msecs

 * @padattr: attribute type for the padding

 */

static inline int nla_put_msecs(struct sk_buff *skb, int attrtype,

				unsigned long njiffies)

				unsigned long njiffies, int padattr)

{

	u64 tmp = jiffies_to_msecs(njiffies);

	return nla_put(skb, attrtype, sizeof(u64), &tmp);



	return nla_put_64bit(skb, attrtype, sizeof(u64), &tmp, padattr);

}



/**

include/uapi/linux/l2tp.h

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ enum { 
	L2TP_ATTR_IP6_DADDR,		/* struct in6_addr */

	L2TP_ATTR_UDP_ZERO_CSUM6_TX,	/* u8 */

	L2TP_ATTR_UDP_ZERO_CSUM6_RX,	/* u8 */

	L2TP_ATTR_PAD,

	__L2TP_ATTR_MAX,

};

include/uapi/linux/neighbour.h

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ enum { 
	NDTPA_LOCKTIME,			/* u64, msecs */

	NDTPA_QUEUE_LENBYTES,		/* u32 */

	NDTPA_MCAST_REPROBES,		/* u32 */

	NDTPA_PAD,

	__NDTPA_MAX

};

#define NDTPA_MAX (__NDTPA_MAX - 1)
@@ -160,6 +161,7 @@ enum { 
	NDTA_PARMS,			/* nested TLV NDTPA_* */

	NDTA_STATS,			/* struct ndt_stats, read-only */

	NDTA_GC_INTERVAL,		/* u64, msecs */

	NDTA_PAD,

	__NDTA_MAX

};

#define NDTA_MAX (__NDTA_MAX - 1)

include/uapi/linux/tcp_metrics.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ enum { 
	TCP_METRICS_ATTR_FOPEN_COOKIE,		/* binary */

	TCP_METRICS_ATTR_SADDR_IPV4,		/* u32 */

	TCP_METRICS_ATTR_SADDR_IPV6,		/* binary */

	TCP_METRICS_ATTR_PAD,



	__TCP_METRICS_ATTR_MAX,

};

net/core/neighbour.c

+10 −9
Original line number Diff line number Diff line
@@ -1763,21 +1763,22 @@ static int neightbl_fill_parms(struct sk_buff *skb, struct neigh_parms *parms) 
			NEIGH_VAR(parms, MCAST_PROBES)) ||

	    nla_put_u32(skb, NDTPA_MCAST_REPROBES,

			NEIGH_VAR(parms, MCAST_REPROBES)) ||

	    nla_put_msecs(skb, NDTPA_REACHABLE_TIME, parms->reachable_time) ||

	    nla_put_msecs(skb, NDTPA_REACHABLE_TIME, parms->reachable_time,

			  NDTPA_PAD) ||

	    nla_put_msecs(skb, NDTPA_BASE_REACHABLE_TIME,

			  NEIGH_VAR(parms, BASE_REACHABLE_TIME)) ||

			  NEIGH_VAR(parms, BASE_REACHABLE_TIME), NDTPA_PAD) ||

	    nla_put_msecs(skb, NDTPA_GC_STALETIME,

			  NEIGH_VAR(parms, GC_STALETIME)) ||

			  NEIGH_VAR(parms, GC_STALETIME), NDTPA_PAD) ||

	    nla_put_msecs(skb, NDTPA_DELAY_PROBE_TIME,

			  NEIGH_VAR(parms, DELAY_PROBE_TIME)) ||

			  NEIGH_VAR(parms, DELAY_PROBE_TIME), NDTPA_PAD) ||

	    nla_put_msecs(skb, NDTPA_RETRANS_TIME,

			  NEIGH_VAR(parms, RETRANS_TIME)) ||

			  NEIGH_VAR(parms, RETRANS_TIME), NDTPA_PAD) ||

	    nla_put_msecs(skb, NDTPA_ANYCAST_DELAY,

			  NEIGH_VAR(parms, ANYCAST_DELAY)) ||

			  NEIGH_VAR(parms, ANYCAST_DELAY), NDTPA_PAD) ||

	    nla_put_msecs(skb, NDTPA_PROXY_DELAY,

			  NEIGH_VAR(parms, PROXY_DELAY)) ||

			  NEIGH_VAR(parms, PROXY_DELAY), NDTPA_PAD) ||

	    nla_put_msecs(skb, NDTPA_LOCKTIME,

			  NEIGH_VAR(parms, LOCKTIME)))

			  NEIGH_VAR(parms, LOCKTIME), NDTPA_PAD))

		goto nla_put_failure;

	return nla_nest_end(skb, nest);
@@ -1804,7 +1805,7 @@ static int neightbl_fill_info(struct sk_buff *skb, struct neigh_table *tbl, 
	ndtmsg->ndtm_pad2   = 0;



	if (nla_put_string(skb, NDTA_NAME, tbl->id) ||

	    nla_put_msecs(skb, NDTA_GC_INTERVAL, tbl->gc_interval) ||

	    nla_put_msecs(skb, NDTA_GC_INTERVAL, tbl->gc_interval, NDTA_PAD) ||

	    nla_put_u32(skb, NDTA_THRESH1, tbl->gc_thresh1) ||

	    nla_put_u32(skb, NDTA_THRESH2, tbl->gc_thresh2) ||

	    nla_put_u32(skb, NDTA_THRESH3, tbl->gc_thresh3))