Changeset 231b3fd in mainline for uspace/lib/nic/src/nic_impl.c

Timestamp:

2018-08-25T21:35:26Z (7 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/lib/nic/src/nic_impl.c (modified) (4 diffs)

uspace/lib/nic/src/nic_impl.c

@@ -121 +121 @@
                 nic_data->poll_mode = nic_data->default_poll_mode;
                 memcpy(&nic_data->poll_period, &nic_data->default_poll_period,
-                    sizeof(struct timeval));
+                    sizeof(struct timespec));
                 if (rc != EOK) {
                         /*
@@ -714 +714 @@
  */
 errno_t nic_poll_get_mode_impl(ddf_fun_t *fun,
-    nic_poll_mode_t *mode, struct timeval *period)
+    nic_poll_mode_t *mode, struct timespec *period)
 {
         nic_t *nic_data = nic_get_from_ddf_fun(fun);
         fibril_rwlock_read_lock(&nic_data->main_lock);
         *mode = nic_data->poll_mode;
-        memcpy(period, &nic_data->poll_period, sizeof(struct timeval));
+        memcpy(period, &nic_data->poll_period, sizeof(struct timespec));
         fibril_rwlock_read_unlock(&nic_data->main_lock);
         return EOK;
@@ -737 +737 @@
  */
 errno_t nic_poll_set_mode_impl(ddf_fun_t *fun,
-    nic_poll_mode_t mode, const struct timeval *period)
+    nic_poll_mode_t mode, const struct timespec *period)
 {
         nic_t *nic_data = nic_get_from_ddf_fun(fun);
@@ -753 +753 @@
                 if (period == NULL)
                         return EINVAL;
-                if (period->tv_sec == 0 && period->tv_usec == 0)
+                if (period->tv_sec == 0 && period->tv_nsec == 0)
                         return EINVAL;
-                if (period->tv_sec < 0 || period->tv_usec < 0)
+                if (period->tv_sec < 0 || period->tv_nsec < 0)
                         return EINVAL;
         }