]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
backports: rt2x00 supress more queue warnings
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 9 Apr 2015 13:34:14 +0000 (15:34 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 9 Apr 2015 13:34:14 +0000 (15:34 +0200)
lfs/backports
src/patches/backports-3.18.1-1_rt2x00usb_suppress_queue_warnings.patch [moved from src/patches/backports-3.18.1-1_rt2800usb_suppress_queue_warnings.patch with 65% similarity]

index 96de955d6ec460ccbcd4c277aa4287a9f0e2860b..59baaccb239e761b505ff79903393b9bdee563e7 100644 (file)
@@ -90,7 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-iwlwifi-noibss_only_on_radar_chan.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.37-rt2800usb_add_dlink_dwa137_usbid.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_rt2800usb_suppress_queue_warnings.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_rt2x00usb_suppress_queue_warnings.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_add_libertas_uap.patch
 
        # smsc mac address patch for pandaboard and raspberry pi
similarity index 65%
rename from src/patches/backports-3.18.1-1_rt2800usb_suppress_queue_warnings.patch
rename to src/patches/backports-3.18.1-1_rt2x00usb_suppress_queue_warnings.patch
index 8270d311d12f00f6333a3cb8c0eeb4a64f2b2a04..3f9308e38f2f99858ff220b9603739b727b0aa2e 100644 (file)
@@ -1,6 +1,6 @@
 diff -Naur backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2800usb.c backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2800usb.c
 --- backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2800usb.c     2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2800usb.c 2015-03-29 21:42:13.865183543 +0200
++++ backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2800usb.c 2015-04-07 11:44:16.647963570 +0200
 @@ -444,7 +444,7 @@
  
        rt2x00usb_register_read(rt2x00dev, TXRXQ_PCNT, &reg);
@@ -28,3 +28,15 @@ diff -Naur backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2800usb.c backpo
                                    entry->entry_idx, qid);
                        break;
                }
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2x00usb.c backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2x00usb.c
+--- backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2x00usb.c     2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2x00usb.c 2015-04-07 11:42:41.723492892 +0200
+@@ -524,7 +524,7 @@
+ static void rt2x00usb_watchdog_tx_dma(struct data_queue *queue)
+ {
+-      rt2x00_warn(queue->rt2x00dev, "TX queue %d DMA timed out, invoke forced forced reset\n",
++      rt2x00_dbg(queue->rt2x00dev, "TX queue %d DMA timed out, invoke forced reset\n",
+                   queue->qid);
+       rt2x00queue_stop_queue(queue);