Merge branch 'v1.4' into v1.5
[librecmc/librecmc.git] / package / kernel / mac80211 / patches / 006-revert-ktime-changes.patch
1 --- a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
2 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
3 @@ -177,7 +177,7 @@ static bool rt2800usb_tx_sta_fifo_read_c
4         if (rt2800usb_txstatus_pending(rt2x00dev)) {
5                 /* Read register after 1 ms */
6                 hrtimer_start(&rt2x00dev->txstatus_timer,
7 -                             TXSTATUS_READ_INTERVAL,
8 +                             ktime_set(0, TXSTATUS_READ_INTERVAL),
9                               HRTIMER_MODE_REL);
10                 return false;
11         }
12 @@ -204,7 +204,7 @@ static void rt2800usb_async_read_tx_stat
13  
14         /* Read TX_STA_FIFO register after 2 ms */
15         hrtimer_start(&rt2x00dev->txstatus_timer,
16 -                     2 * TXSTATUS_READ_INTERVAL,
17 +                     ktime_set(0, 2*TXSTATUS_READ_INTERVAL),
18                       HRTIMER_MODE_REL);
19  }
20