From: David S. Miller Date: Wed, 4 May 2016 18:16:51 +0000 (-0400) Subject: Merge branch 'kill_trans_start' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4d659fcb20d3d3302b429c889a73a92ff2804b9a;p=linux-beck.git Merge branch 'kill_trans_start' Florian Westphal says: ==================== net: remove trans_start from struct net_device We currently have two instances for trans_start, once in net_device and once in netdev_queue. This series removes trans_start from net_device. Updates to dev->trans_start are replaced with updates to netdev queue 0. This series is compile-tested only. Replacement is done in 3 steps: 1. Replace read-accesses: x = dev->trans_start gets replaced by x = dev_trans_start(dev) 2. Replace write accesses: dev->trans_start = jiffies; gets replaced with new helper: netif_trans_update(dev); 3. This helper is then changed to set netdev_get_tx_queue(dev, 0)->trans_start instead of dev->trans_start. After this dev->trans_start can be removed. It should be noted that after this series several instances of netif_trans_update() are useless (if they occur in .ndo_start_xmit and driver doesn't set LLTX flag -- stack already did an update). Comments welcome. ==================== Signed-off-by: David S. Miller --- 4d659fcb20d3d3302b429c889a73a92ff2804b9a