]> git.baikalelectronics.ru Git - kernel.git/commit
net: ptp: fix time stamp matching logic for VLAN packets.
authorRichard Cochran <richardcochran@gmail.com>
Wed, 12 Nov 2014 10:33:52 +0000 (11:33 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 12 Nov 2014 20:06:17 +0000 (15:06 -0500)
commit5718249ff2a903cbfd952ccdbc8007f6d97e9da6
tree959b8ccb4e8db6ceb080f0163298a9d9faecc758
parent2c45cb8598ee6f6e44656cc250ead62b8d5f901d
net: ptp: fix time stamp matching logic for VLAN packets.

Commit 6ba13c97 "ptp: Classify ptp over ip over vlan packets" changed the
code in two drivers that matches time stamps with PTP frames, with the goal
of allowing VLAN tagged PTP packets to receive hardware time stamps.

However, that commit failed to account for the VLAN header when parsing
IPv4 packets. This patch fixes those two drivers to correctly match VLAN
tagged IPv4/UDP PTP messages with their time stamps.

This patch should also be applied to v3.17.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ti/cpts.c
drivers/net/phy/dp83640.c