]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix 4.9 bnx2x build issue
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 28 Jul 2019 09:09:34 +0000 (11:09 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 28 Jul 2019 09:09:34 +0000 (11:09 +0200)
queue-4.9/bnx2x-prevent-ptp_task-to-be-rescheduled-indefinitely.patch

index bd085589ecf35b57353aa3a381ff3b944454a0e4..5dccf114af986a0b83cc741cb391ff26886295c0 100644 (file)
@@ -1,4 +1,4 @@
-From foo@baz Sun 28 Jul 2019 10:45:09 AM CEST
+From foo@baz Fri 26 Jul 2019 12:22:46 PM CEST
 From: "Guilherme G. Piccoli" <gpiccoli@canonical.com>
 Date: Thu, 27 Jun 2019 13:31:33 -0300
 Subject: bnx2x: Prevent ptp_task to be rescheduled indefinitely
@@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                } else if (bp->ptp_tx_skb) {
 -                      BNX2X_ERR("The device supports only a single outstanding packet to timestamp, this packet will not be timestamped\n");
 +                      bp->eth_stats.ptp_skip_tx_ts++;
-+                      netdev_err_once(bp->dev,
++                      dev_err_once(&bp->dev->dev,
 +                                      "Device supports only a single outstanding packet to timestamp, this packet won't be timestamped\n");
                } else {
                        skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;