Commit e5c5d22e authored by Simon Horman's avatar Simon Horman Committed by David S. Miller
Browse files

net: add ETH_P_802_3_MIN 



Add a new constant ETH_P_802_3_MIN, the minimum ethernet type for
an 802.3 frame. Frames with a lower value in the ethernet type field
are Ethernet II.

Also update all the users of this value that David Miller and
I could find to use the new constant.

Also correct a bug in util.c. The comparison with ETH_P_802_3_MIN
should be >= not >.

As suggested by Jesse Gross.

Compile tested only.

Cc: David Miller <davem@davemloft.net>
Cc: Jesse Gross <jesse@nicira.com>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: John W. Linville <linville@tuxdriver.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Bart De Schuymer <bart.de.schuymer@pandora.be>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: Johan Hedberg <johan.hedberg@gmail.com>
Cc: linux-bluetooth@vger.kernel.org
Cc: netfilter-devel@vger.kernel.org
Cc: bridge@lists.linux-foundation.org
Cc: linux-wireless@vger.kernel.org
Cc: linux1394-devel@lists.sourceforge.net
Cc: linux-media@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: dev@openvswitch.org
Acked-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b49a4c7

drivers/firewire/net.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -547,7 +547,7 @@ static int fwnet_finish_incoming_packet(struct net_device *net, 
			if (memcmp(eth->h_dest, net->dev_addr, net->addr_len))

			if (memcmp(eth->h_dest, net->dev_addr, net->addr_len))

				skb->pkt_type = PACKET_OTHERHOST;

				skb->pkt_type = PACKET_OTHERHOST;

		}

		}

		if (ntohs(eth->h_proto) >= 1536) {

		if (ntohs(eth->h_proto) >= ETH_P_802_3_MIN) {

			protocol = eth->h_proto;

			protocol = eth->h_proto;

		} else {

		} else {

			rawp = (u16 *)skb->data;

			rawp = (u16 *)skb->data;

drivers/isdn/i4l/isdn_net.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1385,7 +1385,7 @@ isdn_net_type_trans(struct sk_buff *skb, struct net_device *dev) 
		if (memcmp(eth->h_dest, dev->dev_addr, ETH_ALEN))

		if (memcmp(eth->h_dest, dev->dev_addr, ETH_ALEN))

			skb->pkt_type = PACKET_OTHERHOST;

			skb->pkt_type = PACKET_OTHERHOST;

	}

	}

	if (ntohs(eth->h_proto) >= 1536)

	if (ntohs(eth->h_proto) >= ETH_P_802_3_MIN)

		return eth->h_proto;

		return eth->h_proto;





	rawp = skb->data;

	rawp = skb->data;

drivers/media/dvb-core/dvb_net.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -185,7 +185,7 @@ static __be16 dvb_net_eth_type_trans(struct sk_buff *skb, 
			skb->pkt_type=PACKET_MULTICAST;

			skb->pkt_type=PACKET_MULTICAST;

	}

	}





	if (ntohs(eth->h_proto) >= 1536)

	if (ntohs(eth->h_proto) >= ETH_P_802_3_MIN)

		return eth->h_proto;

		return eth->h_proto;





	rawp = skb->data;

	rawp = skb->data;
@@ -228,9 +228,9 @@ static int ule_test_sndu( struct dvb_net_priv *p ) 
static int ule_bridged_sndu( struct dvb_net_priv *p )

static int ule_bridged_sndu( struct dvb_net_priv *p )

{

{

	struct ethhdr *hdr = (struct ethhdr*) p->ule_next_hdr;

	struct ethhdr *hdr = (struct ethhdr*) p->ule_next_hdr;

	if(ntohs(hdr->h_proto) < 1536) {

	if(ntohs(hdr->h_proto) < ETH_P_802_3_MIN) {

		int framelen = p->ule_sndu_len - ((p->ule_next_hdr+sizeof(struct ethhdr)) - p->ule_skb->data);

		int framelen = p->ule_sndu_len - ((p->ule_next_hdr+sizeof(struct ethhdr)) - p->ule_skb->data);

		/* A frame Type < 1536 for a bridged frame, introduces a LLC Length field. */

		/* A frame Type < ETH_P_802_3_MIN for a bridged frame, introduces a LLC Length field. */

		if(framelen != ntohs(hdr->h_proto)) {

		if(framelen != ntohs(hdr->h_proto)) {

			return -1;

			return -1;

		}

		}
@@ -320,7 +320,7 @@ static int handle_ule_extensions( struct dvb_net_priv *p ) 
			(int) p->ule_sndu_type, l, total_ext_len);

			(int) p->ule_sndu_type, l, total_ext_len);

#endif

#endif





	} while (p->ule_sndu_type < 1536);

	} while (p->ule_sndu_type < ETH_P_802_3_MIN);





	return total_ext_len;

	return total_ext_len;

}

}
@@ -712,7 +712,7 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len ) 
				}

				}





				/* Handle ULE Extension Headers. */

				/* Handle ULE Extension Headers. */

				if (priv->ule_sndu_type < 1536) {

				if (priv->ule_sndu_type < ETH_P_802_3_MIN) {

					/* There is an extension header.  Handle it accordingly. */

					/* There is an extension header.  Handle it accordingly. */

					int l = handle_ule_extensions(priv);

					int l = handle_ule_extensions(priv);

					if (l < 0) {

					if (l < 0) {

drivers/net/ethernet/sun/niu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -6618,7 +6618,7 @@ static u64 niu_compute_tx_flags(struct sk_buff *skb, struct ethhdr *ehdr, 
	       (len << TXHDR_LEN_SHIFT) |

	       (len << TXHDR_LEN_SHIFT) |

	       ((l3off / 2) << TXHDR_L3START_SHIFT) |

	       ((l3off / 2) << TXHDR_L3START_SHIFT) |

	       (ihl << TXHDR_IHL_SHIFT) |

	       (ihl << TXHDR_IHL_SHIFT) |

	       ((eth_proto_inner < 1536) ? TXHDR_LLC : 0) |

	       ((eth_proto_inner < ETH_P_802_3_MIN) ? TXHDR_LLC : 0) |

	       ((eth_proto == ETH_P_8021Q) ? TXHDR_VLAN : 0) |

	       ((eth_proto == ETH_P_8021Q) ? TXHDR_VLAN : 0) |

	       (ipv6 ? TXHDR_IP_VER : 0) |

	       (ipv6 ? TXHDR_IP_VER : 0) |

	       csum_bits);

	       csum_bits);

drivers/net/plip/plip.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -560,7 +560,7 @@ static __be16 plip_type_trans(struct sk_buff *skb, struct net_device *dev) 
	 *	so don't forget to remove it.

	 *	so don't forget to remove it.

	 */

	 */





	if (ntohs(eth->h_proto) >= 1536)

	if (ntohs(eth->h_proto) >= ETH_P_802_3_MIN)

		return eth->h_proto;

		return eth->h_proto;





	rawp = skb->data;

	rawp = skb->data;

CRA Git | Maintained and supported by SUSTech CRA and CCSE