diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-08 03:57:32 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-08 03:57:32 +0400 |
| commit | 0a7fdbde691118b0717058b272284e5f4b81f1bb (patch) | |
| tree | 93afe696badc503ec41b18a82fb5a54c100e2ff9 /include/linux | |
| parent | 239960d66425785affb92d745e3b29e3e9b51745 (diff) | |
| parent | a6111d3c93d05bfaf3fbf70ed2a0b84cb0d65406 (diff) | |
| download | linux-0a7fdbde691118b0717058b272284e5f4b81f1bb.tar.xz | |
Merge branch 'ptp-vlan'
Stefan Sørensen says:
====================
Add ptp vlan support
This patch series adds functionality for running ptp/ieee1588 over vlan.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ptp_classify.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/ptp_classify.h b/include/linux/ptp_classify.h index 7dfed71d76a6..159c987b1853 100644 --- a/include/linux/ptp_classify.h +++ b/include/linux/ptp_classify.h @@ -33,8 +33,8 @@ #define PTP_CLASS_IPV4 0x10 /* event in an IPV4 UDP packet */ #define PTP_CLASS_IPV6 0x20 /* event in an IPV6 UDP packet */ #define PTP_CLASS_L2 0x30 /* event in a L2 packet */ -#define PTP_CLASS_VLAN 0x40 /* event in a VLAN tagged L2 packet */ -#define PTP_CLASS_PMASK 0xf0 /* mask for the packet type field */ +#define PTP_CLASS_PMASK 0x30 /* mask for the packet type field */ +#define PTP_CLASS_VLAN 0x40 /* event in a VLAN tagged packet */ #define PTP_CLASS_V1_IPV4 (PTP_CLASS_V1 | PTP_CLASS_IPV4) #define PTP_CLASS_V1_IPV6 (PTP_CLASS_V1 | PTP_CLASS_IPV6) /* probably DNE */ @@ -54,7 +54,6 @@ #define IP6_HLEN 40 #define UDP_HLEN 8 #define OFF_IHL 14 -#define OFF_PTP6 (ETH_HLEN + IP6_HLEN + UDP_HLEN) #define IPV4_HLEN(data) (((struct iphdr *)(data + OFF_IHL))->ihl << 2) #if defined(CONFIG_NET_PTP_CLASSIFY) |