Commit c3cde44f authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: mscc: ocelot: use pretty names for IPPROTO_UDP and IPPROTO_TCP 



Hardcoding these IP protocol numbers in is2_entry_set() obscures the
purpose of the code, so replace the magic numbers with the definitions
from linux/in.h.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c5a0edae

drivers/net/ethernet/mscc/ocelot_vcap.c

+2 −2
Original line number Diff line number Diff line
@@ -564,9 +564,9 @@ static void is2_entry_set(struct ocelot *ocelot, int ix, 
		val = proto.value[0];

		msk = proto.mask[0];

		type = IS2_TYPE_IP_UDP_TCP;

		if (msk == 0xff && (val == 6 || val == 17)) {

		if (msk == 0xff && (val == IPPROTO_TCP || val == IPPROTO_UDP)) {

			/* UDP/TCP protocol match */

			tcp = (val == 6 ?

			tcp = (val == IPPROTO_TCP ?

			       OCELOT_VCAP_BIT_1 : OCELOT_VCAP_BIT_0);

			vcap_key_bit_set(vcap, &data, VCAP_IS2_HK_TCP, tcp);

			vcap_key_l4_port_set(vcap, &data,