net: eqos: replace api as per k-4.4

Bug 200195187

Change-Id: Ia0fa5f26856f387cea39dcf0bcdf6d2ead57cf8e
Signed-off-by: Jeetesh Burman <jburman@nvidia.com>
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: http://git-master/r/1140061
GVS: Gerrit_Virtual_Submit

2 files changed, 10 insertions, 1 deletions

diff --git a/drivers/net/ethernet/nvidia/eqos/drv.c b/drivers/net/ethernet/nvidia/eqos/drv.c
index 96c99f405..617027371 100644
--- a/drivers/net/ethernet/nvidia/eqos/drv.c
+++ b/drivers/net/ethernet/nvidia/eqos/drv.c
@@ -1712,9 +1712,13 @@ static int eqos_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 #ifdef EQOS_ENABLE_VLAN_TAG
         ptx_ring->vlan_tag_present = 0;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
         if (vlan_tx_tag_present(skb)) {
                 USHORT vlan_tag = vlan_tx_tag_get(skb);
-
+#else
+        if (skb_vlan_tag_present(skb)) {
+                USHORT vlan_tag = skb_vlan_tag_get(skb);
+#endif
                 vlan_tag |= (skb->priority << 13);
                 ptx_ring->vlan_tag_present = 1;
                 if (vlan_tag != ptx_ring->vlan_tag_id ||
diff --git a/drivers/net/ethernet/nvidia/eqos/ptp.c b/drivers/net/ethernet/nvidia/eqos/ptp.c
index 5e5279c85..724ce64b5 100644
--- a/drivers/net/ethernet/nvidia/eqos/ptp.c
+++ b/drivers/net/ethernet/nvidia/eqos/ptp.c
@@ -252,8 +252,13 @@ static struct ptp_clock_info eqos_ptp_clock_ops = {
         .pps = 0,       /* indicates whether the clk supports a PPS callback */
         .adjfreq = eqos_adjust_freq,
         .adjtime = eqos_adjust_time,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
         .gettime = eqos_get_time,
         .settime = eqos_set_time,
+#else
+        .gettime64 = eqos_get_time,
+        .settime64 = eqos_set_time,
+#endif
         .enable = eqos_enable,
 };