Merge branch 'ptp-vlan'

Browse source

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>

...

This commit is contained in:

David S. Miller 2014-07-07 16:57:32 -07:00

parent 239960d664 a6111d3c93

commit 0a7fdbde69

6 changed files with 114 additions and 84 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

24

drivers/net/ethernet/ti/cpts.c

View file

46

drivers/net/phy/dp83640.c

View file

5

include/linux/ptp_classify.h

View file

2

net/8021q/vlan_dev.c

View file

64

net/core/ptp_classifier.c

View file

55

net/core/timestamping.c

View file