korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-15 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: ptp: fix time stamp matching logic for VLAN packets.

Browse Source 
Commit ae5c6c6d "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>
This commit is contained in:
Richard Cochran 2014-11-12 11:33:52 +01:00 committed by David S. Miller
parent ee7bc3cdc2
commit cca04b2854
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/ti/cpts.c
View File

@ -264,7 +264,7 @@ static int cpts_match(struct sk_buff *skb, unsigned int ptp_class,
switch (ptp_class & PTP_CLASS_PMASK) { switch (ptp_class & PTP_CLASS_PMASK) {
case PTP_CLASS_IPV4: case PTP_CLASS_IPV4:
offset += ETH_HLEN + IPV4_HLEN(data) + UDP_HLEN; offset += ETH_HLEN + IPV4_HLEN(data + offset) + UDP_HLEN;
break; break;
case PTP_CLASS_IPV6: case PTP_CLASS_IPV6:
offset += ETH_HLEN + IP6_HLEN + UDP_HLEN; offset += ETH_HLEN + IP6_HLEN + UDP_HLEN;

4
drivers/net/phy/dp83640.c
View File

@ -791,7 +791,7 @@ static int match(struct sk_buff *skb, unsigned int type, struct rxts *rxts)
switch (type & PTP_CLASS_PMASK) { switch (type & PTP_CLASS_PMASK) {
case PTP_CLASS_IPV4: case PTP_CLASS_IPV4:
offset += ETH_HLEN + IPV4_HLEN(data) + UDP_HLEN; offset += ETH_HLEN + IPV4_HLEN(data + offset) + UDP_HLEN;
break; break;
case PTP_CLASS_IPV6: case PTP_CLASS_IPV6:
offset += ETH_HLEN + IP6_HLEN + UDP_HLEN; offset += ETH_HLEN + IP6_HLEN + UDP_HLEN;
@ -934,7 +934,7 @@ static int is_sync(struct sk_buff *skb, int type)
switch (type & PTP_CLASS_PMASK) { switch (type & PTP_CLASS_PMASK) {
case PTP_CLASS_IPV4: case PTP_CLASS_IPV4:
offset += ETH_HLEN + IPV4_HLEN(data) + UDP_HLEN; offset += ETH_HLEN + IPV4_HLEN(data + offset) + UDP_HLEN;
break; break;
case PTP_CLASS_IPV6: case PTP_CLASS_IPV6:
offset += ETH_HLEN + IP6_HLEN + UDP_HLEN; offset += ETH_HLEN + IP6_HLEN + UDP_HLEN;