Commit e7157f28 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'nla_align-set-2' 

Nicolas Dichtel says:

====================
netlink: align attributes when needed (patchset #2)

This is the continuation (series #2) of the work done to align netlink
attributes when these attributes contain some 64-bit fields.

In patch #3, I didn't modify the function ila_encap_nlsize(). I was waiting
feedback for this patch: http://patchwork.ozlabs.org/patch/613766/


If it's approved, there will be an update to switch nla_total_size() to
nla_total_size_64bit() after the merge of net in net-next.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d296ba60 2dad624e

include/linux/nl802154.h

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ enum { 
	IEEE802154_ATTR_LLSEC_DEV_OVERRIDE,

	IEEE802154_ATTR_LLSEC_DEV_KEY_MODE,



	IEEE802154_ATTR_PAD,



	__IEEE802154_ATTR_MAX,

};

include/uapi/linux/if_link.h

+3 −0
Original line number Diff line number Diff line
@@ -271,6 +271,7 @@ enum { 
	IFLA_BR_NF_CALL_IP6TABLES,

	IFLA_BR_NF_CALL_ARPTABLES,

	IFLA_BR_VLAN_DEFAULT_PVID,

	IFLA_BR_PAD,

	__IFLA_BR_MAX,

};
@@ -313,6 +314,7 @@ enum { 
	IFLA_BRPORT_HOLD_TIMER,

	IFLA_BRPORT_FLUSH,

	IFLA_BRPORT_MULTICAST_ROUTER,

	IFLA_BRPORT_PAD,

	__IFLA_BRPORT_MAX

};

#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -666,6 +668,7 @@ enum { 
	IFLA_VF_STATS_TX_BYTES,

	IFLA_VF_STATS_BROADCAST,

	IFLA_VF_STATS_MULTICAST,

	IFLA_VF_STATS_PAD,

	__IFLA_VF_STATS_MAX,

};

include/uapi/linux/ila.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ enum { 
	ILA_ATTR_LOCATOR_MATCH,			/* u64 */

	ILA_ATTR_IFINDEX,			/* s32 */

	ILA_ATTR_DIR,				/* u32 */

	ILA_ATTR_PAD,



	__ILA_ATTR_MAX,

};

include/uapi/linux/ip_vs.h

+1 −0
Original line number Diff line number Diff line
@@ -435,6 +435,7 @@ enum { 
	IPVS_STATS_ATTR_OUTPPS,		/* current out packet rate */

	IPVS_STATS_ATTR_INBPS,		/* current in byte rate */

	IPVS_STATS_ATTR_OUTBPS,		/* current out byte rate */

	IPVS_STATS_ATTR_PAD,

	__IPVS_STATS_ATTR_MAX,

};

include/uapi/linux/l2tp.h

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ enum { 
	L2TP_ATTR_RX_SEQ_DISCARDS,	/* u64 */

	L2TP_ATTR_RX_OOS_PACKETS,	/* u64 */

	L2TP_ATTR_RX_ERRORS,		/* u64 */

	L2TP_ATTR_STATS_PAD,

	__L2TP_ATTR_STATS_MAX,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE