From 87353c0344445b76d9f4d9b135fad936199be90e Mon Sep 17 00:00:00 2001
From: Aggelos Economopoulos <aoiko@cc.ece.ntua.gr>
Date: Thu, 9 Jul 2009 17:55:06 +0300
Subject: [PATCH] get mxge to build, stage 29/many

- remove lro support
---
 sys/dev/netif/mxge/Makefile   |  2 +-
 sys/dev/netif/mxge/if_mxge.c  | 21 ++++++++++++++++++++-
 sys/dev/netif/mxge/mxge_lro.c |  4 ++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/sys/dev/netif/mxge/Makefile b/sys/dev/netif/mxge/Makefile
index ce4ad7f581..1aa00f6b8f 100644
--- a/sys/dev/netif/mxge/Makefile
+++ b/sys/dev/netif/mxge/Makefile
@@ -2,7 +2,7 @@
 #$DragonFly: src/sys/dev/netif/em/Makefile,v 1.10 2008/09/17 08:51:29 sephe Exp $
 
 KMOD=	if_mxge
-SRCS=	if_mxge.c mxge_lro.c if_mxge_var.h mcp_gen_header.h mxge_mcp.h
+SRCS=	if_mxge.c if_mxge_var.h mcp_gen_header.h mxge_mcp.h
 SRCS+=	device_if.h bus_if.h pci_if.h
 SRCS+=	opt_polling.h
 
diff --git a/sys/dev/netif/mxge/if_mxge.c b/sys/dev/netif/mxge/if_mxge.c
index 740c5fcc1c..4c489050be 100644
--- a/sys/dev/netif/mxge/if_mxge.c
+++ b/sys/dev/netif/mxge/if_mxge.c
@@ -143,6 +143,23 @@ static int mxge_close(mxge_softc_t *sc);
 static int mxge_open(mxge_softc_t *sc);
 static void mxge_tick(void *arg);
 
+/* XXX: we don't have Large Receive Offload support yet */
+ inline int
+mxge_lro_rx(struct mxge_slice_state *ss, struct mbuf *m_head, uint32_t csum)
+{
+	(void)ss;
+	(void)m_head;
+	(void)csum;
+	return 1;
+}
+
+ inline void
+mxge_lro_flush(struct mxge_slice_state *ss, struct lro_entry *lro)
+{
+	(void)ss;
+	(void)lro;
+}
+
 static int
 mxge_probe(device_t dev)
 {
@@ -670,6 +687,7 @@ mxge_validate_firmware(mxge_softc_t *sc, const mcp_gen_header_t *hdr)
 
 }
 
+#if 0
 static void *
 z_alloc(void *nil, u_int items, u_int size)
 {
@@ -684,7 +702,7 @@ z_free(void *nil, void *ptr)
 {
         kfree(ptr, M_TEMP);
 }
-
+#endif
 
 static int
 mxge_load_firmware_helper(mxge_softc_t *sc, uint32_t *limit)
@@ -2352,6 +2370,7 @@ done:
 	return err;
 }
 
+
 static int
 mxge_get_buf_big(struct mxge_slice_state *ss, bus_dmamap_t map, int idx)
 {
diff --git a/sys/dev/netif/mxge/mxge_lro.c b/sys/dev/netif/mxge/mxge_lro.c
index 784803cf2f..462164ba3e 100644
--- a/sys/dev/netif/mxge/mxge_lro.c
+++ b/sys/dev/netif/mxge/mxge_lro.c
@@ -51,8 +51,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <machine/bus.h>
 #include <machine/in_cksum.h>
 
-#include <dev/mxge/mxge_mcp.h>
-#include <dev/mxge/if_mxge_var.h>
+#include <dev/netif/mxge/mxge_mcp.h>
+#include <dev/netif/mxge/if_mxge_var.h>
 
 #include "opt_inet.h"
 
-- 
2.11.4.GIT