diff options
author | kmacy <kmacy@FreeBSD.org> | 2008-09-16 02:03:28 +0000 |
---|---|---|
committer | kmacy <kmacy@FreeBSD.org> | 2008-09-16 02:03:28 +0000 |
commit | 00a3b87a5a88883f5cae1103178737c0d99c1220 (patch) | |
tree | ec9afd15d97096e0d16f2f8cd2e2e646acab4e20 /sys/dev/cxgb | |
parent | 612ed6bb13e3eba8b695dd42d0ece8ca60233703 (diff) | |
download | FreeBSD-src-00a3b87a5a88883f5cae1103178737c0d99c1220.zip FreeBSD-src-00a3b87a5a88883f5cae1103178737c0d99c1220.tar.gz |
White space cleanups to bring closer to RELENG_7
Diffstat (limited to 'sys/dev/cxgb')
-rw-r--r-- | sys/dev/cxgb/common/cxgb_t3_hw.c | 2 | ||||
-rw-r--r-- | sys/dev/cxgb/cxgb_adapter.h | 2 | ||||
-rw-r--r-- | sys/dev/cxgb/cxgb_include.h | 2 | ||||
-rw-r--r-- | sys/dev/cxgb/cxgb_main.c | 4 | ||||
-rw-r--r-- | sys/dev/cxgb/cxgb_sge.c | 2 | ||||
-rw-r--r-- | sys/dev/cxgb/sys/cxgb_support.c | 5 | ||||
-rw-r--r-- | sys/dev/cxgb/sys/mbufq.h | 2 | ||||
-rw-r--r-- | sys/dev/cxgb/ulp/toecore/cxgb_toedev.h | 3 |
8 files changed, 6 insertions, 16 deletions
diff --git a/sys/dev/cxgb/common/cxgb_t3_hw.c b/sys/dev/cxgb/common/cxgb_t3_hw.c index a406f91..5e14e2b 100644 --- a/sys/dev/cxgb/common/cxgb_t3_hw.c +++ b/sys/dev/cxgb/common/cxgb_t3_hw.c @@ -1,6 +1,6 @@ /************************************************************************** -Copyright (c) 2007, Chelsio Inc. +Copyright (c) 2007-2008, Chelsio Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/cxgb/cxgb_adapter.h b/sys/dev/cxgb/cxgb_adapter.h index 736b6ce..5ee0400 100644 --- a/sys/dev/cxgb/cxgb_adapter.h +++ b/sys/dev/cxgb/cxgb_adapter.h @@ -25,7 +25,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD$ ***************************************************************************/ @@ -149,7 +148,6 @@ enum { /* adapter flags */ }; #define FL_Q_SIZE 4096 - #define JUMBO_Q_SIZE 1024 #define RSPQ_Q_SIZE 1024 #define TX_ETH_Q_SIZE 1024 diff --git a/sys/dev/cxgb/cxgb_include.h b/sys/dev/cxgb/cxgb_include.h index 6b20d23..9f187ee 100644 --- a/sys/dev/cxgb/cxgb_include.h +++ b/sys/dev/cxgb/cxgb_include.h @@ -2,7 +2,6 @@ * $FreeBSD$ */ - #include <sys/cdefs.h> #include <sys/param.h> #include <sys/types.h> @@ -29,7 +28,6 @@ #include <dev/cxgb/common/cxgb_ctl_defs.h> #include <dev/cxgb/common/cxgb_sge_defs.h> #include <dev/cxgb/common/cxgb_firmware_exports.h> - #include <dev/cxgb/common/jhash.h> #include <dev/cxgb/ulp/toecore/cxgb_toedev.h> #endif diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c index 8898664..6ff907d 100644 --- a/sys/dev/cxgb/cxgb_main.c +++ b/sys/dev/cxgb/cxgb_main.c @@ -1033,7 +1033,7 @@ void t3_fatal_err(struct adapter *sc) { u_int fw_status[4]; - + if (sc->flags & FULL_INIT_DONE) { t3_sge_stop(sc); t3_write_reg(sc, A_XGM_TX_CTRL, 0); @@ -1733,11 +1733,9 @@ offload_open(struct port_info *pi) adapter->params.rev == 0 ? adapter->port[0].ifp->if_mtu : 0xffff); init_smt(adapter); - /* Call back all registered clients */ cxgb_add_clients(tdev); - /* restore them in case the offload module has changed them */ if (err) { t3_tp_set_offload_mode(adapter, 0); diff --git a/sys/dev/cxgb/cxgb_sge.c b/sys/dev/cxgb/cxgb_sge.c index 729bb5f..081ee4f 100644 --- a/sys/dev/cxgb/cxgb_sge.c +++ b/sys/dev/cxgb/cxgb_sge.c @@ -1389,7 +1389,7 @@ t3_encap(struct sge_qset *qs, struct mbuf **m, int count) if (__predict_false(mlen <= PIO_LEN)) { /* pkt not undersized but fits in PIO_LEN - * Indicates a TSO bug + * Indicates a TSO bug at the higher levels. * */ DPRINTF("**5592 Fix** mbuf=%p,len=%d,tso_segsz=%d,csum_flags=%#x,flags=%#x", diff --git a/sys/dev/cxgb/sys/cxgb_support.c b/sys/dev/cxgb/sys/cxgb_support.c index acab2ba..e911dfc 100644 --- a/sys/dev/cxgb/sys/cxgb_support.c +++ b/sys/dev/cxgb/sys/cxgb_support.c @@ -53,12 +53,7 @@ __FBSDID("$FreeBSD$"); #endif extern int cxgb_use_16k_clusters; - -#ifdef _i386__ -int cxgb_pcpu_cache_enable = 0; -#else int cxgb_pcpu_cache_enable = 1; -#endif struct buf_stack { caddr_t *bs_stack; diff --git a/sys/dev/cxgb/sys/mbufq.h b/sys/dev/cxgb/sys/mbufq.h index 81a4d39..5f546a6 100644 --- a/sys/dev/cxgb/sys/mbufq.h +++ b/sys/dev/cxgb/sys/mbufq.h @@ -1,6 +1,6 @@ /************************************************************************** -Copyright (c) 2007, Chelsio Inc. +Copyright (c) 2007-2008, Chelsio Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h b/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h index c70c37d..398923a 100644 --- a/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h +++ b/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h @@ -31,9 +31,10 @@ $FreeBSD$ ***************************************************************************/ #ifndef _CXGB_TOEDEV_H_ -#define _CXGB_TOEDEV_H_ +#define _CXGB_TOEDEV_H_ #include <netinet/toedev.h> + /* offload type ids */ enum { TOE_ID_CHELSIO_T1 = 1, |