projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
net
/
ethernet
/
eth.c
diff --git
a/net/ethernet/eth.c
b/net/ethernet/eth.c
index a36c85eab5b4ebf9992794f3822fd8553f7458c9..5359560926bcf8f17f87c94474fd96cda1f1d6e2 100644
(file)
--- 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;
/*