Changeset 231b3fd in mainline for uspace/drv/nic/e1k/e1k.c

Timestamp:

2018-08-25T21:35:26Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

e2625b1a (diff), 3c45353 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jakub Jermář <jakub@…> (2018-08-25 21:35:26)

git-committer:

GitHub <noreply@…> (2018-08-25 21:35:26)

Message:

Merge 3c453534a2b093c8039d8e8059b923c71f3492a3 into e2625b1a1e5a2895b86f0e39c2d70a39e49e042a

File:

• uspace/drv/nic/e1k/e1k.c (modified) (4 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -327 +327 @@
 }
 
-static uint16_t e1000_calculate_itr_interval_from_usecs(suseconds_t useconds)
+static uint16_t e1000_calculate_itr_interval_from_usecs(usec_t useconds)
 {
         return useconds * 4;
@@ -1299 +1299 @@
 }
 
-/** Calculates ITR register interrupt from timeval structure
+/** Calculates ITR register interrupt from timespec structure
  *
  * @param period Period
  *
  */
-static uint16_t e1000_calculate_itr_interval(const struct timeval *period)
+static uint16_t e1000_calculate_itr_interval(const struct timespec *period)
 {
         // TODO: use also tv_sec
-        return e1000_calculate_itr_interval_from_usecs(period->tv_usec);
+        return e1000_calculate_itr_interval_from_usecs(NSEC2USEC(period->tv_nsec));
 }
 
@@ -1321 +1321 @@
  */
 static errno_t e1000_poll_mode_change(nic_t *nic, nic_poll_mode_t mode,
-    const struct timeval *period)
+    const struct timespec *period)
 {
         assert(nic);
@@ -2182 +2182 @@
                 goto err_rx_structure;
 
-        struct timeval period;
+        struct timespec period;
         period.tv_sec = 0;
-        period.tv_usec = E1000_DEFAULT_INTERRUPT_INTERVAL_USEC;
+        period.tv_nsec = USEC2NSEC(E1000_DEFAULT_INTERRUPT_INTERVAL_USEC);
         rc = nic_report_poll_mode(nic, NIC_POLL_PERIODIC, &period);
         if (rc != EOK)