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

Commit a1e9203c authored by Pieter Jansen van Vuuren's avatar Pieter Jansen van Vuuren Committed by David S. Miller
Browse files

nfp: add IPv4 ttl and tos match offloading support 



Previously matching on IPv4 ttl and tos fields were not offloaded. This
patch enables offloading IPv4 ttl and tos as match fields.

Signed-off-by: default avatarPieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Reviewed-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bb055c19

drivers/net/ethernet/netronome/nfp/flower/match.c

+10 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ nfp_flower_compile_ipv4(struct nfp_flower_ipv4 *frame, 
	struct flow_dissector_key_ipv4_addrs *addr;

	struct flow_dissector_key_basic *basic;



	/* Wildcard TOS/TTL for now. */

	memset(frame, 0, sizeof(struct nfp_flower_ipv4));



	if (dissector_uses_key(flow->dissector,
@@ -174,6 +173,16 @@ nfp_flower_compile_ipv4(struct nfp_flower_ipv4 *frame, 
						  target);

		frame->proto = basic->ip_proto;

	}



	if (dissector_uses_key(flow->dissector, FLOW_DISSECTOR_KEY_IP)) {

		struct flow_dissector_key_ip *flow_ip;



		flow_ip = skb_flow_dissector_target(flow->dissector,

						    FLOW_DISSECTOR_KEY_IP,

						    target);

		frame->tos = flow_ip->tos;

		frame->ttl = flow_ip->ttl;

	}

}



static void

drivers/net/ethernet/netronome/nfp/flower/offload.c

+0 −4
Original line number Diff line number Diff line
@@ -216,10 +216,6 @@ nfp_flower_calculate_key_layers(struct nfp_fl_key_ls *ret_key_ls, 
		/* Ethernet type is present in the key. */

		switch (key_basic->n_proto) {

		case cpu_to_be16(ETH_P_IP):

			if (mask_ip && mask_ip->tos)

				return -EOPNOTSUPP;

			if (mask_ip && mask_ip->ttl)

				return -EOPNOTSUPP;

			key_layer |= NFP_FLOWER_LAYER_IPV4;

			key_size += sizeof(struct nfp_flower_ipv4);

			break;