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

Commit b745d035 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nfnetlink: get rid of u_intX_t types 



Use uX types instead.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 4dee62b1

net/netfilter/nfnetlink.c

+8 −8
Original line number Diff line number Diff line
@@ -100,9 +100,9 @@ int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n) 
}

EXPORT_SYMBOL_GPL(nfnetlink_subsys_unregister);



static inline const struct nfnetlink_subsystem *nfnetlink_get_subsys(u_int16_t type)

static inline const struct nfnetlink_subsystem *nfnetlink_get_subsys(u16 type)

{

	u_int8_t subsys_id = NFNL_SUBSYS_ID(type);

	u8 subsys_id = NFNL_SUBSYS_ID(type);



	if (subsys_id >= NFNL_SUBSYS_COUNT)

		return NULL;
@@ -111,9 +111,9 @@ static inline const struct nfnetlink_subsystem *nfnetlink_get_subsys(u_int16_t t 
}



static inline const struct nfnl_callback *

nfnetlink_find_client(u_int16_t type, const struct nfnetlink_subsystem *ss)

nfnetlink_find_client(u16 type, const struct nfnetlink_subsystem *ss)

{

	u_int8_t cb_id = NFNL_MSG_TYPE(type);

	u8 cb_id = NFNL_MSG_TYPE(type);



	if (cb_id >= ss->cb_count)

		return NULL;
@@ -185,7 +185,7 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 


	{

		int min_len = nlmsg_total_size(sizeof(struct nfgenmsg));

		u_int8_t cb_id = NFNL_MSG_TYPE(nlh->nlmsg_type);

		u8 cb_id = NFNL_MSG_TYPE(nlh->nlmsg_type);

		struct nlattr *cda[ss->cb[cb_id].attr_count + 1];

		struct nlattr *attr = (void *)nlh + min_len;

		int attrlen = nlh->nlmsg_len - min_len;
@@ -273,7 +273,7 @@ enum { 
};



static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh,

				u_int16_t subsys_id)

				u16 subsys_id)

{

	struct sk_buff *oskb = skb;

	struct net *net = sock_net(skb->sk);
@@ -365,7 +365,7 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh, 


		{

			int min_len = nlmsg_total_size(sizeof(struct nfgenmsg));

			u_int8_t cb_id = NFNL_MSG_TYPE(nlh->nlmsg_type);

			u8 cb_id = NFNL_MSG_TYPE(nlh->nlmsg_type);

			struct nlattr *cda[ss->cb[cb_id].attr_count + 1];

			struct nlattr *attr = (void *)nlh + min_len;

			int attrlen = nlh->nlmsg_len - min_len;
@@ -439,7 +439,7 @@ static void nfnetlink_rcv_batch(struct sk_buff *skb, struct nlmsghdr *nlh, 
static void nfnetlink_rcv(struct sk_buff *skb)

{

	struct nlmsghdr *nlh = nlmsg_hdr(skb);

	u_int16_t res_id;

	u16 res_id;

	int msglen;



	if (nlh->nlmsg_len < NLMSG_HDRLEN ||