From b3535a6f652a84f2ab8695952164cf143a93df44 Mon Sep 17 00:00:00 2001 From: Aggelos Economopoulos Date: Fri, 3 Jul 2009 18:35:39 +0300 Subject: [PATCH] get mxge to build, stage 1/many - comment-out __FBSDID - fix some includes - mtx -> lock --- sys/dev/netif/Makefile | 6 +++--- sys/dev/netif/mxge/if_mxge.c | 35 +++++++++++++++------------------- sys/dev/netif/mxge/if_mxge_var.h | 6 +++--- sys/dev/netif/mxge/mxge_eth_z8e.c | 2 +- sys/dev/netif/mxge/mxge_ethp_z8e.c | 2 +- sys/dev/netif/mxge/mxge_lro.c | 2 +- sys/dev/netif/mxge/mxge_rss_eth_z8e.c | 2 +- sys/dev/netif/mxge/mxge_rss_ethp_z8e.c | 2 +- sys/net/ethernet.h | 8 ++------ 9 files changed, 28 insertions(+), 37 deletions(-) diff --git a/sys/dev/netif/Makefile b/sys/dev/netif/Makefile index 0b9b6e1959..effda69423 100644 --- a/sys/dev/netif/Makefile +++ b/sys/dev/netif/Makefile @@ -2,8 +2,8 @@ # SUBDIR= an acx age ale ar ath aue axe bce bfe bge bwi cue dc ed em ep et fwe \ - fxp iwi iwl jme kue lge lnc mii_layer my msk nfe nge pcn ral re rl \ - rtw rue rum sbni sbsh sf sis sk sln sr ste stge ti tl tx txp ural vge \ - vr vx wb wi xe xl ig_hal emx + fxp iwi iwl jme kue lge lnc mii_layer my msk mxge nfe nge pcn ral re \ + rl rtw rue rum sbni sbsh sf sis sk sln sr ste stge ti tl tx txp ural \ + vge vr vx wb wi xe xl ig_hal emx .include diff --git a/sys/dev/netif/mxge/if_mxge.c b/sys/dev/netif/mxge/if_mxge.c index d3810bc453..34d81681f1 100644 --- a/sys/dev/netif/mxge/if_mxge.c +++ b/sys/dev/netif/mxge/if_mxge.c @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.63 2009/06/26 11:45:06 rwatson Exp $"); +/*__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.63 2009/06/26 11:45:06 rwatson Exp $");*/ #include #include @@ -38,13 +38,11 @@ __FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.63 2009/06/26 11:45:06 rwatso #include #include #include -#include #include #include #include #include #include -#include /* count xmits ourselves, rather than via drbr */ #define NO_SLOW_STATS @@ -57,7 +55,7 @@ __FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.63 2009/06/26 11:45:06 rwatso #include #include -#include +#include #include #include @@ -65,16 +63,13 @@ __FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.63 2009/06/26 11:45:06 rwatso #include #include -#include -#include #include #include #include -#include -#include -#include -#include /* XXX for pci_cfg_restore */ +#include +#include +#include /* XXX for pci_cfg_restore */ #include /* for pmap_mapdev() */ #include @@ -83,10 +78,10 @@ __FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.63 2009/06/26 11:45:06 rwatso #include #endif -#include -#include +#include +#include /*#define MXGE_FAKE_IFP*/ -#include +#include #ifdef IFNET_BUF_RING #include #endif @@ -4117,9 +4112,9 @@ mxge_alloc_slices(mxge_softc_t *sc) if (err != 0) goto abort; ss->fw_stats = (mcp_irq_data_t *)ss->fw_stats_dma.addr; - snprintf(ss->tx.mtx_name, sizeof(ss->tx.mtx_name), + snprintf(ss->tx.lock_name, sizeof(ss->tx.mtx_name), "%s:tx(%d)", device_get_nameunit(sc->dev), i); - mtx_init(&ss->tx.mtx, ss->tx.mtx_name, NULL, MTX_DEF); + lock_init(&ss->tx.lock, ss->tx.lock_name, 0, LK_CANRECURSE); #ifdef IFNET_BUF_RING ss->tx.br = buf_ring_alloc(2048, M_DEVBUF, M_WAITOK, &ss->tx.mtx); @@ -4475,13 +4470,13 @@ mxge_attach(device_t dev) } if_initname(ifp, device_get_name(dev), device_get_unit(dev)); - snprintf(sc->cmd_mtx_name, sizeof(sc->cmd_mtx_name), "%s:cmd", + snprintf(sc->cmd_lock_name, sizeof(sc->cmd_lock_name), "%s:cmd", device_get_nameunit(dev)); - mtx_init(&sc->cmd_mtx, sc->cmd_mtx_name, NULL, MTX_DEF); - snprintf(sc->driver_mtx_name, sizeof(sc->driver_mtx_name), + lock_init(&sc->cmd_lock, sc->cmd_lock_name, 0, LK_CANRECURSE); + snprintf(sc->driver_lock_name, sizeof(sc->driver_lock_name), "%s:drv", device_get_nameunit(dev)); - mtx_init(&sc->driver_mtx, sc->driver_mtx_name, - MTX_NETWORK_LOCK, MTX_DEF); + lock_init(&sc->driver_lock, sc->driver_lock_name, + 0, LK_CANRECURSE); callout_init_mtx(&sc->co_hdl, &sc->driver_mtx, 0); diff --git a/sys/dev/netif/mxge/if_mxge_var.h b/sys/dev/netif/mxge/if_mxge_var.h index 7e5bbf053a..dd9d4bc316 100644 --- a/sys/dev/netif/mxge/if_mxge_var.h +++ b/sys/dev/netif/mxge/if_mxge_var.h @@ -129,7 +129,7 @@ typedef struct typedef struct { - struct mtx mtx; + struct lock lock; #ifdef IFNET_BUF_RING struct buf_ring *br; #endif @@ -155,7 +155,7 @@ typedef struct int watchdog_done; /* cache of done */ int watchdog_rx_pause; /* cache of pause rq recvd */ int defrag; - char mtx_name[16]; + char lock_name[16]; } mxge_tx_ring_t; struct lro_entry; @@ -275,7 +275,7 @@ struct mxge_softc { uint8_t mac_addr[6]; /* eeprom mac address */ char product_code_string[64]; char serial_number_string[64]; - char cmd_mtx_name[16]; + char cmd_lock_name[16]; char driver_mtx_name[16]; }; diff --git a/sys/dev/netif/mxge/mxge_eth_z8e.c b/sys/dev/netif/mxge/mxge_eth_z8e.c index b14da3ebf4..6cc707cace 100644 --- a/sys/dev/netif/mxge/mxge_eth_z8e.c +++ b/sys/dev/netif/mxge/mxge_eth_z8e.c @@ -2,7 +2,7 @@ * from: FreeBSD: src/sys/tools/fw_stub.awk,v 1.6 2007/03/02 11:42:53 flz */ #include -__FBSDID("$FreeBSD: src/sys/dev/mxge/mxge_eth_z8e.c,v 1.1 2007/07/19 16:15:59 gallatin Exp $"); +/*__FBSDID("$FreeBSD: src/sys/dev/mxge/mxge_eth_z8e.c,v 1.1 2007/07/19 16:15:59 gallatin Exp $");*/ #include #include #include diff --git a/sys/dev/netif/mxge/mxge_ethp_z8e.c b/sys/dev/netif/mxge/mxge_ethp_z8e.c index 557a29d9e0..ec74a29cc0 100644 --- a/sys/dev/netif/mxge/mxge_ethp_z8e.c +++ b/sys/dev/netif/mxge/mxge_ethp_z8e.c @@ -2,7 +2,7 @@ * from: FreeBSD: src/sys/tools/fw_stub.awk,v 1.6 2007/03/02 11:42:53 flz */ #include -__FBSDID("$FreeBSD: src/sys/dev/mxge/mxge_ethp_z8e.c,v 1.1 2007/07/19 16:15:59 gallatin Exp $"); +/*__FBSDID("$FreeBSD: src/sys/dev/mxge/mxge_ethp_z8e.c,v 1.1 2007/07/19 16:15:59 gallatin Exp $");*/ #include #include #include diff --git a/sys/dev/netif/mxge/mxge_lro.c b/sys/dev/netif/mxge/mxge_lro.c index da0ada57de..784803cf2f 100644 --- a/sys/dev/netif/mxge/mxge_lro.c +++ b/sys/dev/netif/mxge/mxge_lro.c @@ -28,7 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ #include -__FBSDID("$FreeBSD: src/sys/dev/mxge/mxge_lro.c,v 1.8 2009/06/23 17:42:06 gallatin Exp $"); +/*__FBSDID("$FreeBSD: src/sys/dev/mxge/mxge_lro.c,v 1.8 2009/06/23 17:42:06 gallatin Exp $");*/ #include #include diff --git a/sys/dev/netif/mxge/mxge_rss_eth_z8e.c b/sys/dev/netif/mxge/mxge_rss_eth_z8e.c index 0a9301c189..d719bcbf17 100644 --- a/sys/dev/netif/mxge/mxge_rss_eth_z8e.c +++ b/sys/dev/netif/mxge/mxge_rss_eth_z8e.c @@ -2,7 +2,7 @@ * from: FreeBSD: src/sys/tools/fw_stub.awk,v 1.6 2007/03/02 11:42:53 flz */ #include -__FBSDID("$FreeBSD: src/sys/dev/mxge/mxge_rss_eth_z8e.c,v 1.1 2008/01/15 20:34:48 gallatin Exp $"); +/*__FBSDID("$FreeBSD: src/sys/dev/mxge/mxge_rss_eth_z8e.c,v 1.1 2008/01/15 20:34:48 gallatin Exp $");*/ #include #include #include diff --git a/sys/dev/netif/mxge/mxge_rss_ethp_z8e.c b/sys/dev/netif/mxge/mxge_rss_ethp_z8e.c index faf8f69ae9..76f96cd6b2 100644 --- a/sys/dev/netif/mxge/mxge_rss_ethp_z8e.c +++ b/sys/dev/netif/mxge/mxge_rss_ethp_z8e.c @@ -2,7 +2,7 @@ * from: FreeBSD: src/sys/tools/fw_stub.awk,v 1.6 2007/03/02 11:42:53 flz */ #include -__FBSDID("$FreeBSD: src/sys/dev/mxge/mxge_rss_ethp_z8e.c,v 1.1 2008/01/15 20:34:48 gallatin Exp $"); +/*__FBSDID("$FreeBSD: src/sys/dev/mxge/mxge_rss_ethp_z8e.c,v 1.1 2008/01/15 20:34:48 gallatin Exp $");*/ #include #include #include diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h index 13b55f04bd..bdc13a2fab 100644 --- a/sys/net/ethernet.h +++ b/sys/net/ethernet.h @@ -50,12 +50,7 @@ * The maximum packet length. */ #define ETHER_MAX_LEN 1518 - -/* - * A macro to validate a length with - */ -#define ETHER_IS_VALID_LEN(foo) \ - ((foo) >= ETHER_MIN_LEN && (foo) <= ETHER_MAX_LEN) +#define ETHER_MAX_LEN_JUMBO 9018 /* max jumbo frame len, including CRC */ /* * Ethernet CRC32 polynomials (big- and little-endian verions). @@ -353,6 +348,7 @@ extern const uint8_t etherbroadcastaddr[ETHER_ADDR_LEN]; #define ETHERMTU (ETHER_MAX_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN) #define ETHERMIN (ETHER_MIN_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN) +#define ETHERMTU_JUMBO (ETHER_MAX_LEN_JUMBO - ETHER_HDR_LEN - ETHER_CRC_LEN) #ifdef _KERNEL -- 2.11.4.GIT