]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
drivers: fix dev->trans_start removal fallout
authorFlorian Westphal <fw@strlen.de>
Wed, 4 May 2016 20:56:07 +0000 (22:56 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 May 2016 21:07:14 +0000 (17:07 -0400)
kbuild test robot reported a build failure on s390.
While at it, also fix missing conversion in the tilera driver.

Fixes: 9b36627acecd5792 ("net: remove dev->trans_start")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/tile/tilepro.c
drivers/s390/net/qeth_core_main.c

index 0bb98bc70c9dc347c4beb64728a00cab1dce3a66..922a443e3415bf0656ff7c989412958701d79f96 100644 (file)
@@ -2026,7 +2026,7 @@ static void tile_net_tx_timeout(struct net_device *dev)
 {
        PDEBUG("tile_net_tx_timeout()\n");
        PDEBUG("Transmit timeout at %ld, latency %ld\n", jiffies,
-              jiffies - dev->trans_start);
+              jiffies - dev_trans_start(dev));
 
        /* XXX: ISSUE: This doesn't seem useful for us. */
        netif_wake_queue(dev);
index 787153764120cc8db03ef577cb485ffa765b7735..b7b74776e2ff581922b6b070554c62f4a9e35dbc 100644 (file)
@@ -3481,7 +3481,7 @@ static void qeth_flush_buffers(struct qeth_qdio_out_q *queue, int index,
                }
        }
 
-       queue->card->dev->trans_start = jiffies;
+       netif_trans_update(queue->card->dev);
        if (queue->card->options.performance_stats) {
                queue->card->perf_stats.outbound_do_qdio_cnt++;
                queue->card->perf_stats.outbound_do_qdio_start_time =