diff options
author | Renato Botelho <renato@netgate.com> | 2016-02-28 10:08:29 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-02-28 10:08:29 -0300 |
commit | afdadc06a5da33ea6f46448ec5a8244cf6bf754d (patch) | |
tree | 0d5fcd0eacffb1f234a3c97e9ea66a4b6d28d973 /sys/dev/e1000/if_igb.h | |
parent | a0ada2282856db4c48a6cbeadba5e7c6d74d45cf (diff) | |
parent | 15dc3e2435d0a1243a7938c5eda77de938e4f5de (diff) | |
download | FreeBSD-src-afdadc06a5da33ea6f46448ec5a8244cf6bf754d.zip FreeBSD-src-afdadc06a5da33ea6f46448ec5a8244cf6bf754d.tar.gz |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/dev/e1000/if_igb.h')
-rw-r--r-- | sys/dev/e1000/if_igb.h | 71 |
1 files changed, 63 insertions, 8 deletions
diff --git a/sys/dev/e1000/if_igb.h b/sys/dev/e1000/if_igb.h index 2708a7c..431437d 100644 --- a/sys/dev/e1000/if_igb.h +++ b/sys/dev/e1000/if_igb.h @@ -32,11 +32,66 @@ ******************************************************************************/ /*$FreeBSD$*/ -#ifndef _IGB_H_DEFINED_ -#define _IGB_H_DEFINED_ +#ifndef _IF_IGB_H_ +#define _IF_IGB_H_ + +#include <sys/param.h> +#include <sys/systm.h> + +#include <sys/buf_ring.h> + +#include <sys/bus.h> +#include <sys/endian.h> +#include <sys/kernel.h> +#include <sys/kthread.h> +#include <sys/malloc.h> +#include <sys/mbuf.h> +#include <sys/module.h> +#include <sys/rman.h> +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/sysctl.h> +#include <sys/taskqueue.h> +#include <sys/eventhandler.h> +#include <sys/pcpu.h> +#include <sys/smp.h> +#include <machine/smp.h> +#include <machine/bus.h> +#include <machine/resource.h> + +#include <net/bpf.h> +#include <net/ethernet.h> +#include <net/if.h> +#include <net/if_var.h> +#include <net/if_arp.h> +#include <net/if_dl.h> +#include <net/if_media.h> +#ifdef RSS +#include <net/rss_config.h> +#include <netinet/in_rss.h> +#endif -/* Tunables */ +#include <net/if_types.h> +#include <net/if_vlan_var.h> + +#include <netinet/in_systm.h> +#include <netinet/in.h> +#include <netinet/if_ether.h> +#include <netinet/ip.h> +#include <netinet/ip6.h> +#include <netinet/tcp.h> +#include <netinet/tcp_lro.h> +#include <netinet/udp.h> + +#include <machine/in_cksum.h> +#include <dev/led/led.h> +#include <dev/pci/pcivar.h> +#include <dev/pci/pcireg.h> + +#include "e1000_api.h" +#include "e1000_82575.h" +/* Tunables */ /* * IGB_TXD: Maximum number of Transmit Descriptors * @@ -168,7 +223,7 @@ /* * Micellaneous constants */ -#define IGB_VENDOR_ID 0x8086 +#define IGB_INTEL_VENDOR_ID 0x8086 #define IGB_JUMBO_PBA 0x00000028 #define IGB_DEFAULT_PBA 0x00000030 @@ -223,7 +278,7 @@ #define HW_DEBUGOUT1(S, A) if (DEBUG_HW) printf(S "\n", A) #define HW_DEBUGOUT2(S, A, B) if (DEBUG_HW) printf(S "\n", A, B) -#define IGB_MAX_SCATTER 64 +#define IGB_MAX_SCATTER 40 #define IGB_VFTA_SIZE 128 #define IGB_BR_SIZE 4096 /* ring buf size */ #define IGB_TSO_SIZE (65535 + sizeof(struct ether_vlan_header)) @@ -310,10 +365,10 @@ struct tx_ring { u32 txd_cmd; bus_dma_tag_t txtag; char mtx_name[16]; -#ifndef IGB_LEGACY_TX + struct buf_ring *br; struct task txq_task; -#endif + u32 bytes; /* used for AIM */ u32 packets; /* Soft Stats */ @@ -566,6 +621,6 @@ drbr_needs_enqueue(struct ifnet *ifp, struct buf_ring *br) } #endif -#endif /* _IGB_H_DEFINED_ */ +#endif /* _IF_IGB_H_ */ |