Merge "PTP: specify ethernet interfaces in the ptp4l.conf file."

puppet-manifests/centos/build_srpm.data

@@ -1,2 +1,2 @@
 SRC_DIR="src"
-TIS_PATCH_VER=63
+TIS_PATCH_VER=64

puppet-manifests/src/modules/platform/templates/ptp4l.conf.erb

@@ -96,12 +96,14 @@ manufacturerIdentity    00:00:00
 userDescription         ;
 timeSource              0xA0
 
-<%- if scope['platform::ptp::transport'] == 'udp' -%>
 [<%= @slave_interface %>]
+<%- if scope['platform::ptp::transport'] == 'udp' -%>
 network_transport       UDPv<%= @slave_subnet %>
+<%- end -%>
 
 <%- if @slave_only == false -%>
 [<%= @master_interface %>]
+<%- if scope['platform::ptp::transport'] == 'udp' -%>
 network_transport       UDPv<%= @master_subnet %>
 <%- end -%>
 <%- end -%>