can: Handle netdev->last_rx and netdev_tx_t properly for 2.6.31

[socketcan-devel.git] / kernel / 2.6 / drivers / net / can / dev.c

diff --git a/kernel/2.6/drivers/net/can/dev.c b/kernel/2.6/drivers/net/can/dev.c
index 8306edf595addfd902bf228535ff62e78eec9d54..cc13c968c54915f58e483d48511aa74cbc20ff3e 100644 (file)
--- a/kernel/2.6/drivers/net/can/dev.c
+++ b/kernel/2.6/drivers/net/can/dev.c
@@ -152,9 +152,7 @@ static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt)
                }
        }
 
-       /* real sample point */
-       bt->sample_point = can_update_spt(btc, sampl_pt, best_tseg,
-                                         &tseg1, &tseg2);
+       spt = can_update_spt(btc, sampl_pt, best_tseg, &tseg1, &tseg2);
 
        v64 = (u64)best_brp * 1000000000UL;
        do_div(v64, priv->clock.freq);
@@ -167,6 +165,8 @@ static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt)
 #ifndef CONFIG_CAN_DEV_SYSFS
        /* real bit-rate */
        bt->bitrate = priv->clock.freq / (bt->brp * (tseg1 + tseg2 + 1));
+       /* real sample point */
+       bt->sample_point = spt;
 #endif
        return 0;
 }
@@ -404,7 +404,9 @@ void can_restart(unsigned long data)
 
        netif_rx(skb);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
        dev->last_rx = jiffies;
+#endif
        stats->rx_packets++;
        stats->rx_bytes += cf->can_dlc;