Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f4c1f9b authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

[NETLINK]: Introduce nested and byteorder flag to netlink attribute 



This change allows the generic attribute interface to be used within
the netfilter subsystem where this flag was initially introduced.

The byte-order flag is yet unused, it's intended use is to
allow automatic byte order convertions for all atomic types.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9d5010db

include/linux/netlink.h

+14 −0
Original line number Diff line number Diff line
@@ -131,6 +131,20 @@ struct nlattr 
	__u16           nla_type;

};



/*

 * nla_type (16 bits)

 * +---+---+-------------------------------+

 * | N | O | Attribute Type                |

 * +---+---+-------------------------------+

 * N := Carries nested attributes

 * O := Payload stored in network byte order

 *

 * Note: The N and O flag are mutually exclusive.

 */

#define NLA_F_NESTED		(1 << 15)

#define NLA_F_NET_BYTEORDER	(1 << 14)

#define NLA_TYPE_MASK		~(NLA_F_NESTED | NLA_F_NET_BYTEORDER)



#define NLA_ALIGNTO		4

#define NLA_ALIGN(len)		(((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1))

#define NLA_HDRLEN		((int) NLA_ALIGN(sizeof(struct nlattr)))

include/net/netlink.h

+9 −0
Original line number Diff line number Diff line
@@ -666,6 +666,15 @@ static inline int nla_padlen(int payload) 
	return nla_total_size(payload) - nla_attr_size(payload);

}



/**

 * nla_type - attribute type

 * @nla: netlink attribute

 */

static inline int nla_type(const struct nlattr *nla)

{

	return nla->nla_type & NLA_TYPE_MASK;

}



/**

 * nla_data - head of payload

 * @nla: netlink attribute

net/ipv4/fib_frontend.c

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ static int rtm_to_fib_config(struct sk_buff *skb, struct nlmsghdr *nlh, 
	}



	nlmsg_for_each_attr(attr, nlh, sizeof(struct rtmsg), remaining) {

		switch (attr->nla_type) {

		switch (nla_type(attr)) {

		case RTA_DST:

			cfg->fc_dst = nla_get_be32(attr);

			break;

net/ipv4/fib_semantics.c

+1 −1
Original line number Diff line number Diff line
@@ -743,7 +743,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg) 
		int remaining;



		nla_for_each_attr(nla, cfg->fc_mx, cfg->fc_mx_len, remaining) {

			int type = nla->nla_type;

			int type = nla_type(nla);



			if (type) {

				if (type > RTAX_MAX)

net/ipv6/route.c

+1 −1
Original line number Diff line number Diff line
@@ -1279,7 +1279,7 @@ int ip6_route_add(struct fib6_config *cfg) 
		int remaining;



		nla_for_each_attr(nla, cfg->fc_mx, cfg->fc_mx_len, remaining) {

			int type = nla->nla_type;

			int type = nla_type(nla);



			if (type) {

				if (type > RTAX_MAX) {