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]
/
drivers
/
firewire
/
net.c
diff --git
a/drivers/firewire/net.c
b/drivers/firewire/net.c
index 56796330a162f4725e3893a8edcc24f46b5d5175..4d565365e476c1f7bdef79070fe66b7cb17a0457 100644
(file)
--- a/
drivers/firewire/net.c
+++ b/
drivers/firewire/net.c
@@
-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))
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;
} else {
rawp = (u16 *)skb->data;