diff options
| author | jfv <jfv@FreeBSD.org> | 2007-07-12 19:04:11 +0000 |
|---|---|---|
| committer | jfv <jfv@FreeBSD.org> | 2007-07-12 19:04:11 +0000 |
| commit | d58cd18c5164fb7361a42727fa935fbccfb82f78 (patch) | |
| tree | 9cf58938d9ba0f0b09269ce47d5d374485de4454 | |
| parent | 2e20545b470e8e91a9783428eaf70b934f46bf30 (diff) | |
| download | FreeBSD-src-d58cd18c5164fb7361a42727fa935fbccfb82f78.zip FreeBSD-src-d58cd18c5164fb7361a42727fa935fbccfb82f78.tar.gz | |
A couple late breaking bugs that testing have turned up.
- change include style so build in kernel try OR standalone work.
- Limit HWCSUM - I was led to believe that it would work with RSS,
but our testing had odd issues which suggests this is false.
- A fatfinger error in the ioctl code made ifconfig up not work.
Approved by: re
| -rw-r--r-- | sys/dev/ixgbe/ixgbe.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/ixgbe/ixgbe.c b/sys/dev/ixgbe/ixgbe.c index a43d37f..6e1707d 100644 --- a/sys/dev/ixgbe/ixgbe.c +++ b/sys/dev/ixgbe/ixgbe.c @@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE. #include "opt_device_polling.h" #endif -#include <dev/ixgbe/ixgbe.h> +#include "ixgbe.h" /********************************************************************* * Set this to one to display debug statistics @@ -533,7 +533,7 @@ ixgbe_ioctl(struct ifnet * ifp, u_long command, caddr_t data) IOCTL_DEBUGOUT("ioctl: SIOCSIFFLAGS (Set Interface Flags)"); IXGBE_LOCK(adapter); if (ifp->if_flags & IFF_UP) { - if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { + if ((ifp->if_drv_flags & IFF_DRV_RUNNING)) { if ((ifp->if_flags ^ adapter->if_flags) & IFF_PROMISC) { ixgbe_disable_promisc(adapter); @@ -1630,7 +1630,10 @@ ixgbe_setup_interface(device_t dev, struct adapter *adapter) */ ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header); - ifp->if_capabilities |= (IFCAP_HWCSUM | IFCAP_TSO4); + if (adapter->msix) /* Don't use CSUM with RSS */ + ifp->if_capabilities |= IFCAP_TSO4; + else + ifp->if_capabilities |= (IFCAP_HWCSUM | IFCAP_TSO4); ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU; ifp->if_capabilities |= IFCAP_JUMBO_MTU; |
