svn commit: r250184 - head/sys/dev/netmap

[Luigi Rizzo]

Author: luigi
Date: Thu May  2 16:01:04 2013
New Revision: 250184
URL: http://svnweb.freebsd.org/changeset/base/250184

Log:
  remove trailing whitespace

Modified:
  head/sys/dev/netmap/if_em_netmap.h
  head/sys/dev/netmap/if_re_netmap.h
  head/sys/dev/netmap/netmap.c
  head/sys/dev/netmap/netmap_mem2.c

Modified: head/sys/dev/netmap/if_em_netmap.h
==============================================================================
--- head/sys/dev/netmap/if_em_netmap.h	Thu May  2 15:03:30 2013	(r250183)
+++ head/sys/dev/netmap/if_em_netmap.h	Thu May  2 16:01:04 2013	(r250184)
@@ -276,7 +276,7 @@ em_netmap_rxsync(struct ifnet *ifp, u_in
 	k = ring->cur;
 	if (k > lim)
 		return netmap_ring_reinit(kring);
- 
+
 	if (do_lock)
 		EM_RX_LOCK(rxr);
 

Modified: head/sys/dev/netmap/if_re_netmap.h
==============================================================================
--- head/sys/dev/netmap/if_re_netmap.h	Thu May  2 15:03:30 2013	(r250183)
+++ head/sys/dev/netmap/if_re_netmap.h	Thu May  2 16:01:04 2013	(r250184)
@@ -150,7 +150,7 @@ re_netmap_txsync(struct ifnet *ifp, u_in
 
 	/* update avail to what the kernel knows */
 	ring->avail = kring->nr_hwavail;
-	
+
 	j = kring->nr_hwcur;
 	if (j != k) {	/* we have new packets to send */
 		l = sc->rl_ldata.rl_tx_prodidx;
@@ -169,7 +169,7 @@ re_netmap_txsync(struct ifnet *ifp, u_in
 				// XXX what about prodidx ?
 				return netmap_ring_reinit(kring);
 			}
-			
+
 			if (l == lim)	/* mark end of ring */
 				cmd |= RL_TDESC_CMD_EOR;
 
@@ -334,7 +334,7 @@ re_netmap_rxsync(struct ifnet *ifp, u_in
  */
 static void
 re_netmap_tx_init(struct rl_softc *sc)
-{   
+{
 	struct rl_txdesc *txd;
 	struct rl_desc *desc;
 	int i, n;

Modified: head/sys/dev/netmap/netmap.c
==============================================================================
--- head/sys/dev/netmap/netmap.c	Thu May  2 15:03:30 2013	(r250183)
+++ head/sys/dev/netmap/netmap.c	Thu May  2 16:01:04 2013	(r250184)
@@ -168,10 +168,10 @@ SYSCTL_INT(_dev_netmap, OID_AUTO, bridge
 
 #endif /* !linux */
 
-/*  
+/*
  * These are used to handle reference counters for bridge ports.
  */
-#define	ADD_BDG_REF(ifp)	refcount_acquire(&NA(ifp)->na_bdg_refcount)  
+#define	ADD_BDG_REF(ifp)	refcount_acquire(&NA(ifp)->na_bdg_refcount)
 #define	DROP_BDG_REF(ifp)	refcount_release(&NA(ifp)->na_bdg_refcount)
 
 static void bdg_netmap_attach(struct ifnet *ifp);
@@ -313,7 +313,7 @@ netmap_update_config(struct netmap_adapt
 		txd = na->num_tx_desc;
 		rxr = na->num_rx_rings;
 		rxd = na->num_rx_desc;
-	}	
+	}
 
 	if (na->num_tx_rings == txr && na->num_tx_desc == txd &&
 	    na->num_rx_rings == rxr && na->num_rx_desc == rxd)

Modified: head/sys/dev/netmap/netmap_mem2.c
==============================================================================
--- head/sys/dev/netmap/netmap_mem2.c	Thu May  2 15:03:30 2013	(r250183)
+++ head/sys/dev/netmap/netmap_mem2.c	Thu May  2 16:01:04 2013	(r250184)
@@ -101,7 +101,7 @@
 // #define NMA_LOCK_T		safe_spinlock_t
 #define NMA_LOCK_T		struct semaphore
 #define NMA_LOCK_INIT()		sema_init(&nm_mem.nm_mtx, 1)
-#define NMA_LOCK_DESTROY()	
+#define NMA_LOCK_DESTROY()
 #define NMA_LOCK()		down(&nm_mem.nm_mtx)
 #define NMA_UNLOCK()		up(&nm_mem.nm_mtx)
 #else /* !linux */
@@ -527,12 +527,12 @@ netmap_config_obj_allocator(struct netma
 		objsize += LINE_ROUND - i;
 	}
 	if (objsize < p->objminsize || objsize > p->objmaxsize) {
-		D("requested objsize %d out of range [%d, %d]", 
+		D("requested objsize %d out of range [%d, %d]",
 			objsize, p->objminsize, p->objmaxsize);
 		goto error;
 	}
 	if (objtotal < p->nummin || objtotal > p->nummax) {
-		D("requested objtotal %d out of range [%d, %d]", 
+		D("requested objtotal %d out of range [%d, %d]",
 			objtotal, p->nummin, p->nummax);
 		goto error;
 	}
@@ -693,7 +693,7 @@ netmap_memory_config(void)
 		/* reset previous allocation */
 		for (i = 0; i < NETMAP_POOLS_NR; i++) {
 			netmap_reset_obj_allocator(&nm_mem.pools[i]);
-		}    
+		}
 		nm_mem.finalized = 0;
         }