net: ptp: fix time stamp matching logic for VLAN packets. (cca04b28) · Commits · 戴 / test

Commit "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

+1 −1

Original line number	Diff line number	Diff line
		@@ -264,7 +264,7 @@ static int cpts_match(struct sk_buff *skb, unsigned int ptp_class,

		switch (ptp_class & PTP_CLASS_PMASK) {
		case PTP_CLASS_IPV4:
		offset += ETH_HLEN + IPV4_HLEN(data) + UDP_HLEN;
		offset += ETH_HLEN + IPV4_HLEN(data + offset) + UDP_HLEN;
		break;
		case PTP_CLASS_IPV6:
		offset += ETH_HLEN + IP6_HLEN + UDP_HLEN;

drivers/net/phy/dp83640.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -791,7 +791,7 @@ static int match(struct sk_buff skb, unsigned int type, struct rxts rxts)

		switch (type & PTP_CLASS_PMASK) {
		case PTP_CLASS_IPV4:
		offset += ETH_HLEN + IPV4_HLEN(data) + UDP_HLEN;
		offset += ETH_HLEN + IPV4_HLEN(data + offset) + UDP_HLEN;
		break;
		case PTP_CLASS_IPV6:
		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) {
		case PTP_CLASS_IPV4:
		offset += ETH_HLEN + IPV4_HLEN(data) + UDP_HLEN;
		offset += ETH_HLEN + IPV4_HLEN(data + offset) + UDP_HLEN;
		break;
		case PTP_CLASS_IPV6:
		offset += ETH_HLEN + IP6_HLEN + UDP_HLEN;

Admin message