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

Commit 6713fc9b authored May 04, 2015 by Alexander Duyck Committed by David S. Miller May 05, 2015

openvswitch: Use eth_proto_is_802_3

Replace "ntohs(proto) >= ETH_P_802_3_MIN" w/ eth_proto_is_802_3(proto).

Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent d181ddca

net/openvswitch/datapath.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -545,7 +545,7 @@ static int ovs_packet_cmd_execute(struct sk_buff skb, struct genl_info info)
		/* Normally, setting the skb 'protocol' field would be handled by a
		* call to eth_type_trans(), but it assumes there's a sending
		* device, which we may not have. */
		if (ntohs(eth->h_proto) >= ETH_P_802_3_MIN)
		if (eth_proto_is_802_3(eth->h_proto))
		packet->protocol = eth->h_proto;
		else
		packet->protocol = htons(ETH_P_802_2);

net/openvswitch/flow.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -332,7 +332,7 @@ static __be16 parse_ethertype(struct sk_buff *skb)
		proto = (__be16 ) skb->data;
		__skb_pull(skb, sizeof(__be16));

		if (ntohs(proto) >= ETH_P_802_3_MIN)
		if (eth_proto_is_802_3(proto))
		return proto;

		if (skb->len < sizeof(struct llc_snap_hdr))
		@@ -349,7 +349,7 @@ static __be16 parse_ethertype(struct sk_buff *skb)

		__skb_pull(skb, sizeof(struct llc_snap_hdr));

		if (ntohs(llc->ethertype) >= ETH_P_802_3_MIN)
		if (eth_proto_is_802_3(llc->ethertype))
		return llc->ethertype;

		return htons(ETH_P_802_2);

net/openvswitch/flow_netlink.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -816,7 +816,7 @@ static int ovs_key_from_nlattrs(struct sw_flow_match *match, u64 attrs,
		if (is_mask) {
		/* Always exact match EtherType. */
		eth_type = htons(0xffff);
		} else if (ntohs(eth_type) < ETH_P_802_3_MIN) {
		} else if (!eth_proto_is_802_3(eth_type)) {
		OVS_NLERR(log, "EtherType %x is less than min %x",
		ntohs(eth_type), ETH_P_802_3_MIN);
		return -EINVAL;