aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/netmap/netmap_monitor.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/netmap/netmap_monitor.c')
-rw-r--r--sys/dev/netmap/netmap_monitor.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/netmap/netmap_monitor.c b/sys/dev/netmap/netmap_monitor.c
index f6b7c93adc768..8b118ced9ad59 100644
--- a/sys/dev/netmap/netmap_monitor.c
+++ b/sys/dev/netmap/netmap_monitor.c
@@ -139,7 +139,7 @@ nm_is_zmon(struct netmap_adapter *na)
static int
netmap_monitor_txsync(struct netmap_kring *kring, int flags)
{
- RD(1, "%s %x", kring->name, flags);
+ RD(1, "%s %x", kring->name, flags);
return EIO;
}
@@ -152,10 +152,10 @@ netmap_monitor_txsync(struct netmap_kring *kring, int flags)
static int
netmap_monitor_rxsync(struct netmap_kring *kring, int flags)
{
- ND("%s %x", kring->name, flags);
+ ND("%s %x", kring->name, flags);
kring->nr_hwcur = kring->rhead;
mb();
- return 0;
+ return 0;
}
/* nm_krings_create callbacks for monitors.
@@ -198,7 +198,7 @@ nm_monitor_alloc(struct netmap_kring *kring, u_int n)
return 0;
old_len = sizeof(struct netmap_kring *)*kring->max_monitors;
- len = sizeof(struct netmap_kring *) * n;
+ len = sizeof(struct netmap_kring *) * n;
nm = nm_os_realloc(kring->monitors, len, old_len);
if (nm == NULL)
return ENOMEM;
@@ -621,14 +621,14 @@ out_rxsync:
static int
netmap_zmon_parent_txsync(struct netmap_kring *kring, int flags)
{
- return netmap_zmon_parent_sync(kring, flags, NR_TX);
+ return netmap_zmon_parent_sync(kring, flags, NR_TX);
}
/* callback used to replace the nm_sync callback in the monitored rx rings */
static int
netmap_zmon_parent_rxsync(struct netmap_kring *kring, int flags)
{
- return netmap_zmon_parent_sync(kring, flags, NR_RX);
+ return netmap_zmon_parent_sync(kring, flags, NR_RX);
}
static int
@@ -802,7 +802,7 @@ netmap_monitor_parent_notify(struct netmap_kring *kring, int flags)
notify = kring->mon_notify;
}
nm_kr_put(kring);
- return notify(kring, flags);
+ return notify(kring, flags);
}
@@ -829,7 +829,7 @@ int
netmap_get_monitor_na(struct nmreq_header *hdr, struct netmap_adapter **na,
struct netmap_mem_d *nmd, int create)
{
- struct nmreq_register *req = (struct nmreq_register *)hdr->nr_body;
+ struct nmreq_register *req = (struct nmreq_register *)(uintptr_t)hdr->nr_body;
struct nmreq_register preq;
struct netmap_adapter *pna; /* parent adapter */
struct netmap_monitor_adapter *mna;
@@ -856,9 +856,9 @@ netmap_get_monitor_na(struct nmreq_header *hdr, struct netmap_adapter **na,
*/
memcpy(&preq, req, sizeof(preq));
preq.nr_flags &= ~(NR_MONITOR_TX | NR_MONITOR_RX | NR_ZCOPY_MON);
- hdr->nr_body = (uint64_t)&preq;
+ hdr->nr_body = (uintptr_t)&preq;
error = netmap_get_na(hdr, &pna, &ifp, nmd, create);
- hdr->nr_body = (uint64_t)req;
+ hdr->nr_body = (uintptr_t)req;
if (error) {
D("parent lookup failed: %d", error);
return error;