diff options
| author | luigi <luigi@FreeBSD.org> | 2012-04-13 16:03:07 +0000 |
|---|---|---|
| committer | luigi <luigi@FreeBSD.org> | 2012-04-13 16:03:07 +0000 |
| commit | 39cda1ca4325c5b7ed65df26537fc6176664b0e7 (patch) | |
| tree | 6df9197348ba0a60d72f07d20731dcaf1dbfbb31 /sys/net | |
| parent | 9780a82bfd79651ab52a185ece1816f12c7acacb (diff) | |
| download | FreeBSD-src-39cda1ca4325c5b7ed65df26537fc6176664b0e7.zip FreeBSD-src-39cda1ca4325c5b7ed65df26537fc6176664b0e7.tar.gz | |
A bit of cleanup in the names of fields of netmap-related structures.
Use the name 'ring' instead of 'queue' in all fields.
Bump NETMAP_API.
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/netmap.h | 10 | ||||
| -rw-r--r-- | sys/net/netmap_user.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/net/netmap.h b/sys/net/netmap.h index caa51b0..1aa5e29 100644 --- a/sys/net/netmap.h +++ b/sys/net/netmap.h @@ -83,8 +83,8 @@ / | cur | NETMAP_IF (nifp, one per file desc.) / | avail | +---------------+ / | buf_ofs | - | ni_num_queues | / +=============+ - | | / | buf_idx | slot[0] + | ni_tx_rings | / +=============+ + | ni_rx_rings | / | buf_idx | slot[0] | | / | len, flags | | | / +-------------+ +===============+ / | buf_idx | slot[1] @@ -221,8 +221,8 @@ struct netmap_ring { struct netmap_if { char ni_name[IFNAMSIZ]; /* name of the interface. */ const u_int ni_version; /* API version, currently unused */ - const u_int ni_rx_queues; /* number of rx queue pairs */ - const u_int ni_tx_queues; /* if zero, same as ni_tx_queues */ + const u_int ni_rx_rings; /* number of rx rings */ + const u_int ni_tx_rings; /* if zero, same as ni_rx_rings */ /* * The following array contains the offset of each netmap ring * from this structure. The first ni_tx_queues+1 entries refer @@ -257,7 +257,7 @@ struct netmap_if { struct nmreq { char nr_name[IFNAMSIZ]; uint32_t nr_version; /* API version */ -#define NETMAP_API 2 /* current version */ +#define NETMAP_API 3 /* current version */ uint32_t nr_offset; /* nifp offset in the shared region */ uint32_t nr_memsize; /* size of the shared region */ uint32_t nr_tx_slots; /* slots in tx rings */ diff --git a/sys/net/netmap_user.h b/sys/net/netmap_user.h index 4efdec3..743ec32 100644 --- a/sys/net/netmap_user.h +++ b/sys/net/netmap_user.h @@ -70,7 +70,7 @@ #define NETMAP_RXRING(nifp, index) \ ((struct netmap_ring *)((char *)(nifp) + \ - (nifp)->ring_ofs[index + (nifp)->ni_tx_queues+1] ) ) + (nifp)->ring_ofs[index + (nifp)->ni_tx_rings + 1] ) ) #define NETMAP_BUF(ring, index) \ ((char *)(ring) + (ring)->buf_ofs + ((index)*(ring)->nr_buf_size)) |
