d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove trailing whitespace. No code changes.

Browse Source
This commit is contained in:
Luigi Rizzo 2016-10-18 15:41:57 +00:00
parent fbb9e715c0
commit 6ad42d71b2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=307572
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/netmap/if_vtnet_netmap.h
View File

@ -127,7 +127,7 @@ vtnet_netmap_txsync(struct netmap_kring *kring, int flags)
* First part: process new packets to send.
*/
rmb();
nm_i = kring->nr_hwcur;
if (nm_i != head) { /* we have new packets to send */
struct sglist *sg = txq->vtntx_sg;
@ -182,7 +182,7 @@ vtnet_netmap_txsync(struct netmap_kring *kring, int flags)
virtqueue_enable_intr(vq); // like postpone with 0
}
/* Free used slots. We only consider our own used buffers, recognized
* by the token we passed to virtqueue_add_outbuf.
*/

10
sys/dev/netmap/netmap_monitor.c
View File

@ -191,7 +191,7 @@ nm_monitor_alloc(struct netmap_kring *kring, u_int n)
if (n <= kring->max_monitors)
/* we already have more entries that requested */
return 0;
len = sizeof(struct netmap_kring *) * n;
#ifndef _WIN32
nm = realloc(kring->monitors, len, M_DEVBUF, M_NOWAIT | M_ZERO);
@ -301,7 +301,7 @@ netmap_monitor_del(struct netmap_kring *mkring, struct netmap_kring *kring)
kring->nm_sync = kring->mon_sync;
kring->mon_sync = NULL;
if (kring->tx == NR_RX) {
ND("%s: restoring notify on %s: %p",
ND("%s: restoring notify on %s: %p",
mkring->name, kring->name, kring->mon_notify);
kring->nm_notify = kring->mon_notify;
kring->mon_notify = NULL;
@ -406,7 +406,7 @@ netmap_monitor_reg_common(struct netmap_adapter *na, int onoff, int zmon)
/*
****************************************************************
* functions specific for zero-copy monitors
* functions specific for zero-copy monitors
****************************************************************
*/
@ -554,7 +554,7 @@ netmap_zmon_dtor(struct netmap_adapter *na)
/*
****************************************************************
* functions specific for copy monitors
* functions specific for copy monitors
****************************************************************
*/
@ -729,7 +729,7 @@ netmap_get_monitor_na(struct nmreq *nmr, struct netmap_adapter **na, int create)
if ((nmr->nr_flags & (NR_MONITOR_TX | NR_MONITOR_RX)) == 0) {
if (nmr->nr_flags & NR_ZCOPY_MON) {
/* the flag makes no sense unless you are
/* the flag makes no sense unless you are
* creating a monitor
*/
return EINVAL;

4
sys/dev/netmap/netmap_pipe.c
View File

@ -92,7 +92,7 @@ nm_pipe_alloc(struct netmap_adapter *na, u_int npipes)
if (npipes <= na->na_max_pipes)
/* we already have more entries that requested */
return 0;
if (npipes < na->na_next_pipe || npipes > NM_MAXPIPES)
return EINVAL;
@ -402,7 +402,7 @@ netmap_pipe_reg(struct netmap_adapter *na, int onoff)
}
}
}
/* create all missing needed rings on the other end */
error = netmap_mem_rings_create(ona);
if (error)

4
sys/dev/netmap/netmap_vale.c
View File

@ -906,7 +906,7 @@ nm_bdg_create_kthreads(struct nm_bdg_polling_state *bps)
int affinity = bps->cpu_from + i;
t->bps = bps;
t->qfirst = all ? bps->qfirst /* must be 0 */: affinity;
t->qfirst = all ? bps->qfirst /* must be 0 */: affinity;
t->qlast = all ? bps->qlast : t->qfirst + 1;
D("kthread %d a:%u qf:%u ql:%u", i, affinity, t->qfirst,
t->qlast);
@ -2540,7 +2540,7 @@ netmap_bwrap_notify(struct netmap_kring *kring, int flags)
struct netmap_kring *hw_kring;
int error;
ND("%s: na %s hwna %s",
ND("%s: na %s hwna %s",
(kring ? kring->name : "NULL!"),
(na ? na->name : "NULL!"),
(hwna ? hwna->name : "NULL!"));

18
sys/net/netmap_user.h
View File

@ -391,8 +391,8 @@ struct win_netmap_fd_list {
HANDLE win_netmap_handle;
};
/*
* list head containing all the netmap opened fd and their
/*
* list head containing all the netmap opened fd and their
* windows HANDLE counterparts
*/
static struct win_netmap_fd_list *win_netmap_fd_list_head;
@ -453,7 +453,7 @@ win_get_netmap_handle(int fd)
/*
* use this function only from netmap_user.h internal functions
* same as ioctl, returns 0 on success and -1 on error
* same as ioctl, returns 0 on success and -1 on error
*/
static int
win_nm_ioctl_internal(HANDLE h, int32_t ctlCode, void *arg)
@ -499,9 +499,9 @@ win_nm_ioctl_internal(HANDLE h, int32_t ctlCode, void *arg)
return ioctlReturnStatus ? 0 : -1;
}
/*
/*
* this function is what must be called from user-space programs
* same as ioctl, returns 0 on success and -1 on error
* same as ioctl, returns 0 on success and -1 on error
*/
static int
win_nm_ioctl(int fd, int32_t ctlCode, void *arg)
@ -541,7 +541,7 @@ win32_mmap_emulated(void *addr, size_t length, int prot, int flags, int fd, int3
#include <sys/poll.h> /* XXX needed to use the structure pollfd */
static int
static int
win_nm_poll(struct pollfd *fds, int nfds, int timeout)
{
HANDLE h;
@ -564,7 +564,7 @@ win_nm_poll(struct pollfd *fds, int nfds, int timeout)
#define poll win_nm_poll
static int
static int
win_nm_open(char* pathname, int flags)
{
@ -583,7 +583,7 @@ win_nm_open(char* pathname, int flags)
#define open win_nm_open
static int
static int
win_nm_close(int fd)
{
if (fd != -1) {
@ -919,7 +919,7 @@ nm_close(struct nm_desc *d)
if (d->fd != -1) {
close(d->fd);
}
bzero(d, sizeof(*d));
free(d);
return 0;