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

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

flow_dissector: Don't use bit fields. 



Just have a flags member instead.

   In file included from include/linux/linkage.h:4:0,
                    from include/linux/kernel.h:6,
                    from net/core/flow_dissector.c:1:
   In function 'flow_keys_hash_start',
       inlined from 'flow_hash_from_keys' at net/core/flow_dissector.c:553:34:
>> include/linux/compiler.h:447:38: error: call to '__compiletime_assert_459' declared with attribute error: BUILD_BUG_ON failed: FLOW_KEYS_HASH_OFFSET % sizeof(u32)

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 41ecc3d3

include/net/flow_dissector.h

+5 −3
Original line number Original line Diff line number Diff line
@@ -12,11 +12,13 @@ 
struct flow_dissector_key_control {

struct flow_dissector_key_control {

	u16	thoff;

	u16	thoff;

	u16	addr_type;

	u16	addr_type;

	u32	is_fragment:1;

	u32	flags;

	u32	first_frag:1;

	u32	encapsulation:1;

};

};





#define FLOW_DIS_IS_FRAGMENT	BIT(0)

#define FLOW_DIS_FIRST_FRAG	BIT(1)

#define FLOW_DIS_ENCAPSULATION	BIT(2)



/**

/**

 * struct flow_dissector_key_basic:

 * struct flow_dissector_key_basic:

 * @thoff: Transport header offset

 * @thoff: Transport header offset

net/core/flow_dissector.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -189,12 +189,12 @@ bool __skb_flow_dissect(const struct sk_buff *skb, 
		key_control->addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;

		key_control->addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS;





		if (ip_is_fragment(iph)) {

		if (ip_is_fragment(iph)) {

			key_control->is_fragment = 1;

			key_control->flags |= FLOW_DIS_IS_FRAGMENT;





			if (iph->frag_off & htons(IP_OFFSET)) {

			if (iph->frag_off & htons(IP_OFFSET)) {

				goto out_good;

				goto out_good;

			} else {

			} else {

				key_control->first_frag = 1;

				key_control->flags |= FLOW_DIS_FIRST_FRAG;

				if (!(flags & FLOW_DISSECTOR_F_PARSE_1ST_FRAG))

				if (!(flags & FLOW_DISSECTOR_F_PARSE_1ST_FRAG))

					goto out_good;

					goto out_good;

			}

			}
@@ -398,7 +398,7 @@ bool __skb_flow_dissect(const struct sk_buff *skb, 
			nhoff += sizeof(*eth);

			nhoff += sizeof(*eth);

		}

		}





		key_control->encapsulation = 1;

		key_control->flags |= FLOW_DIS_ENCAPSULATION;

		if (flags & FLOW_DISSECTOR_F_STOP_AT_ENCAP)

		if (flags & FLOW_DISSECTOR_F_STOP_AT_ENCAP)

			goto out_good;

			goto out_good;
@@ -434,12 +434,12 @@ bool __skb_flow_dissect(const struct sk_buff *skb, 
		if (!fh)

		if (!fh)

			goto out_bad;

			goto out_bad;





		key_control->is_fragment = 1;

		key_control->flags |= FLOW_DIS_IS_FRAGMENT;





		nhoff += sizeof(_fh);

		nhoff += sizeof(_fh);





		if (!(fh->frag_off & htons(IP6_OFFSET))) {

		if (!(fh->frag_off & htons(IP6_OFFSET))) {

			key_control->first_frag = 1;

			key_control->flags |= FLOW_DIS_FIRST_FRAG;

			if (flags & FLOW_DISSECTOR_F_PARSE_1ST_FRAG) {

			if (flags & FLOW_DISSECTOR_F_PARSE_1ST_FRAG) {

				ip_proto = fh->nexthdr;

				ip_proto = fh->nexthdr;

				goto ip_proto_again;

				goto ip_proto_again;
@@ -450,7 +450,7 @@ bool __skb_flow_dissect(const struct sk_buff *skb, 
	case IPPROTO_IPIP:

	case IPPROTO_IPIP:

		proto = htons(ETH_P_IP);

		proto = htons(ETH_P_IP);





		key_control->encapsulation = 1;

		key_control->flags |= FLOW_DIS_ENCAPSULATION;

		if (flags & FLOW_DISSECTOR_F_STOP_AT_ENCAP)

		if (flags & FLOW_DISSECTOR_F_STOP_AT_ENCAP)

			goto out_good;

			goto out_good;
@@ -458,7 +458,7 @@ bool __skb_flow_dissect(const struct sk_buff *skb, 
	case IPPROTO_IPV6:

	case IPPROTO_IPV6:

		proto = htons(ETH_P_IPV6);

		proto = htons(ETH_P_IPV6);





		key_control->encapsulation = 1;

		key_control->flags |= FLOW_DIS_ENCAPSULATION;

		if (flags & FLOW_DISSECTOR_F_STOP_AT_ENCAP)

		if (flags & FLOW_DISSECTOR_F_STOP_AT_ENCAP)

			goto out_good;

			goto out_good;