8 files changed, 10 insertions, 10 deletions

diff --git a/net/atm/lec.h b/net/atm/lec.h
index a86aff9a3c04..4149db1b7885 100644
--- a/net/atm/lec.h
+++ b/net/atm/lec.h
@@ -58,7 +58,7 @@ struct lane2_ops {
  *    field in h_type field. Data follows immediately after header.
  * 2. LLC Data frames whose total length, including LLC field and data,
  *    but not padding required to meet the minimum data frame length,
- *    is less than 1536(0x0600) MUST be encoded by placing that length
+ *    is less than ETH_P_802_3_MIN MUST be encoded by placing that length
  *    in the h_type field. The LLC field follows header immediately.
  * 3. LLC data frames longer than this maximum MUST be encoded by placing
  *    the value 0 in the h_type field.
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c
index e58c8b32589c..4b488ec26105 100644
--- a/net/bluetooth/bnep/netdev.c
+++ b/net/bluetooth/bnep/netdev.c
@@ -136,7 +136,7 @@ static u16 bnep_net_eth_proto(struct sk_buff *skb)
         struct ethhdr *eh = (void *) skb->data;
         u16 proto = ntohs(eh->h_proto);
 
-        if (proto >= 1536)
+        if (proto >= ETH_P_802_3_MIN)
                 return proto;
 
         if (get_unaligned((__be16 *) skb->data) == htons(0xFFFF))
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 8d493c91a562..3d110c4fc787 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -138,7 +138,7 @@ ebt_basic_match(const struct ebt_entry *e, const struct sk_buff *skb,
                 ethproto = h->h_proto;
 
         if (e->bitmask & EBT_802_3) {
-                if (FWINV2(ntohs(ethproto) >= 1536, EBT_IPROTO))
+                if (FWINV2(ntohs(ethproto) >= ETH_P_802_3_MIN, EBT_IPROTO))
                         return 1;
         } else if (!(e->bitmask & EBT_NOPROTO) &&
            FWINV2(e->ethproto != ethproto, EBT_IPROTO))
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index a36c85eab5b4..5359560926bc 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -195,7 +195,7 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev)
         if (netdev_uses_trailer_tags(dev))
                 return htons(ETH_P_TRAILER);
 
-        if (ntohs(eth->h_proto) >= 1536)
+        if (ntohs(eth->h_proto) >= ETH_P_802_3_MIN)
                 return eth->h_proto;
 
         /*
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 8914d2d2881a..4e8a86163fc7 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2085,7 +2085,7 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
                 encaps_data = bridge_tunnel_header;
                 encaps_len = sizeof(bridge_tunnel_header);
                 skip_header_bytes -= 2;
-        } else if (ethertype >= 0x600) {
+        } else if (ethertype >= ETH_P_802_3_MIN) {
                 encaps_data = rfc1042_header;
                 encaps_len = sizeof(rfc1042_header);
                 skip_header_bytes -= 2;
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index d61cd9971808..8759265a3e46 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -681,7 +681,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) >= 1536)
+        if (ntohs(eth->h_proto) >= ETH_P_802_3_MIN)
                 packet->protocol = eth->h_proto;
         else
                 packet->protocol = htons(ETH_P_802_2);
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index fe0e4215c73d..332486839347 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -466,7 +466,7 @@ static __be16 parse_ethertype(struct sk_buff *skb)
         proto = *(__be16 *) skb->data;
         __skb_pull(skb, sizeof(__be16));
 
-        if (ntohs(proto) >= 1536)
+        if (ntohs(proto) >= ETH_P_802_3_MIN)
                 return proto;
 
         if (skb->len < sizeof(struct llc_snap_hdr))
@@ -483,7 +483,7 @@ static __be16 parse_ethertype(struct sk_buff *skb)
 
         __skb_pull(skb, sizeof(struct llc_snap_hdr));
 
-        if (ntohs(llc->ethertype) >= 1536)
+        if (ntohs(llc->ethertype) >= ETH_P_802_3_MIN)
                 return llc->ethertype;
 
         return htons(ETH_P_802_2);
@@ -1038,7 +1038,7 @@ int ovs_flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp,
 
         if (attrs & (1 << OVS_KEY_ATTR_ETHERTYPE)) {
                 swkey->eth.type = nla_get_be16(a[OVS_KEY_ATTR_ETHERTYPE]);
-                if (ntohs(swkey->eth.type) < 1536)
+                if (ntohs(swkey->eth.type) < ETH_P_802_3_MIN)
                         return -EINVAL;
                 attrs &= ~(1 << OVS_KEY_ATTR_ETHERTYPE);
         } else {
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 37a56ee1e1ed..6cbac99ae03d 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -511,7 +511,7 @@ int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr,
                 encaps_data = bridge_tunnel_header;
                 encaps_len = sizeof(bridge_tunnel_header);
                 skip_header_bytes -= 2;
-        } else if (ethertype > 0x600) {
+        } else if (ethertype >= ETH_P_802_3_MIN) {
                 encaps_data = rfc1042_header;
                 encaps_len = sizeof(rfc1042_header);
                 skip_header_bytes -= 2;