]> rtime.felk.cvut.cz Git - vajnamar/linux-xlnx.git/commitdiff
net: ethernet: Fix race condition in the driver for 10G/25G MAC
authorKedareswara rao Appana <appana.durga.rao@xilinx.com>
Tue, 29 Nov 2016 15:17:37 +0000 (20:47 +0530)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 20 Dec 2016 06:58:07 +0000 (07:58 +0100)
When XILINX_AXI_EMAC_HWTSTAMP config is enabled in the driver
the rx_hwtsamp API is valid only for 10G/25G MAC.

This patch adds a check for the same in the driver.

Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/net/ethernet/xilinx/xilinx_axienet_main.c

index 932386961e0ac712840e99465e10550f0d41fd6b..238bb9239d1be9de0d2009752cf2c523dac3c5cc 100644 (file)
@@ -1142,7 +1142,7 @@ static int axienet_recv(struct net_device *ndev, int budget)
                        time64 = sec * NS_PER_SEC + nsec;
                        shhwtstamps = skb_hwtstamps(skb);
                        shhwtstamps->hwtstamp = ns_to_ktime(time64);
-               } else {
+               } else if (lp->axienet_config->mactype == XAXIENET_10G_25G) {
                        axienet_rx_hwtstamp(lp, skb);
                }
 #endif