4 files changed, 22 insertions, 3 deletions

diff --git a/sys/dev/qlxgbe/ql_hw.c b/sys/dev/qlxgbe/ql_hw.c
index 816e86a2c94c..340fc779b10c 100644
--- a/sys/dev/qlxgbe/ql_hw.c
+++ b/sys/dev/qlxgbe/ql_hw.c
@@ -2751,6 +2751,7 @@ qla_config_rss_ind_table(qla_host_t *ha)
 static int
 qla_config_soft_lro(qla_host_t *ha)
 {
+#if defined(INET) || defined(INET6)
         int i;
         qla_hw_t *hw = &ha->hw;
         struct lro_ctrl *lro;
@@ -2780,12 +2781,14 @@ qla_config_soft_lro(qla_host_t *ha)
         }
 
         QL_DPRINT2(ha, (ha->pci_dev, "%s: LRO initialized\n", __func__));
+#endif
         return (0);
 }
 
 static void
 qla_drain_soft_lro(qla_host_t *ha)
 {
+#if defined(INET) || defined(INET6)
         int i;
         qla_hw_t *hw = &ha->hw;
         struct lro_ctrl *lro;
@@ -2805,6 +2808,7 @@ qla_drain_soft_lro(qla_host_t *ha)
 		}
 #endif /* #if (__FreeBSD_version >= 1100101) */
 	}
+#endif
 
 	return;
 }
@@ -2812,6 +2816,7 @@ qla_drain_soft_lro(qla_host_t *ha)
 static void
 qla_free_soft_lro(qla_host_t *ha)
 {
+#if defined(INET) || defined(INET6)
         int i;
         qla_hw_t *hw = &ha->hw;
         struct lro_ctrl *lro;
@@ -2820,6 +2825,7 @@ qla_free_soft_lro(qla_host_t *ha)
                	lro = &hw->sds[i].lro;
 		tcp_lro_free(lro);
 	}
+#endif
 
 	return;
 }
diff --git a/sys/dev/qlxgbe/ql_isr.c b/sys/dev/qlxgbe/ql_isr.c
index c31d5369e0d6..0d1ae164c7ae 100644
--- a/sys/dev/qlxgbe/ql_isr.c
+++ b/sys/dev/qlxgbe/ql_isr.c
@@ -68,9 +68,11 @@ qla_rx_intr(qla_host_t *ha, qla_sgl_rcv_t *sgc, uint32_t sds_idx)
 	uint32_t		i, rem_len = 0;
 	uint32_t		r_idx = 0;
 	qla_rx_ring_t		*rx_ring;
+#if defined(INET) || defined(INET6)
 	struct lro_ctrl		*lro;
 
 	lro = &ha->hw.sds[sds_idx].lro;
+#endif
 
 	if (ha->hw.num_rds_rings > 1)
 		r_idx = sds_idx;
@@ -173,6 +175,7 @@ qla_rx_intr(qla_host_t *ha, qla_sgl_rcv_t *sgc, uint32_t sds_idx)
 #endif
 #endif /* #if __FreeBSD_version >= 1100000 */
 
+#if defined(INET) || defined(INET6)
 	if (ha->hw.enable_soft_lro) {
 #if (__FreeBSD_version >= 1100101)
 
@@ -184,7 +187,9 @@ qla_rx_intr(qla_host_t *ha, qla_sgl_rcv_t *sgc, uint32_t sds_idx)
 
 #endif /* #if (__FreeBSD_version >= 1100101) */
 
-	} else {
+	} else
+#endif
+	{
 		(*ifp->if_input)(ifp, mpf);
 	}
 
@@ -725,6 +730,7 @@ ql_rcv_isr(qla_host_t *ha, uint32_t sds_idx, uint32_t count)
 		}
 	}
 
+#if defined(INET) || defined(INET6)
 	if (ha->hw.enable_soft_lro) {
 		struct lro_ctrl		*lro;
 
@@ -745,6 +751,7 @@ ql_rcv_isr(qla_host_t *ha, uint32_t sds_idx, uint32_t count)
 
 #endif /* #if (__FreeBSD_version >= 1100101) */
 	}
+#endif
 
 	if (ha->stop_rcv)
 		goto ql_rcv_isr_exit;
diff --git a/sys/dev/qlxgbe/ql_os.c b/sys/dev/qlxgbe/ql_os.c
index 2a7a173ece41..62289eb878e2 100644
--- a/sys/dev/qlxgbe/ql_os.c
+++ b/sys/dev/qlxgbe/ql_os.c
@@ -1022,7 +1022,9 @@ qla_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	int ret = 0;
 	struct ifreq *ifr = (struct ifreq *)data;
+#ifdef INET
 	struct ifaddr *ifa = (struct ifaddr *)data;
+#endif
 	qla_host_t *ha;
 
 	ha = (qla_host_t *)ifp->if_softc;
@@ -1034,6 +1036,7 @@ qla_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		QL_DPRINT4(ha, (ha->pci_dev, "%s: SIOCSIFADDR (0x%lx)\n",
 			__func__, cmd));
 
+#ifdef INET
 		if (ifa->ifa_addr->sa_family == AF_INET) {
 			ret = QLA_LOCK(ha, __func__,
 					QLA_LOCK_DEFAULT_MS_TIMEOUT,
@@ -1058,9 +1061,10 @@ qla_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 				ntohl(IA_SIN(ifa)->sin_addr.s_addr)));
 
 			arp_ifinit(ifp, ifa);
-		} else {
-			ether_ioctl(ifp, cmd, data);
+			break;
 		}
+#endif
+		ether_ioctl(ifp, cmd, data);
 		break;
 
 	case SIOCSIFMTU:
diff --git a/sys/dev/qlxgbe/ql_os.h b/sys/dev/qlxgbe/ql_os.h
index f14c395d9663..fcee6e740828 100644
--- a/sys/dev/qlxgbe/ql_os.h
+++ b/sys/dev/qlxgbe/ql_os.h
@@ -36,6 +36,8 @@
 #ifndef _QL_OS_H_
 #define _QL_OS_H_
 
+#include "opt_inet.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>