svn commit: r223350 - head/sys/dev/e1000

Sergey Kandaurov pluknet at freebsd.org
Sat Jun 25 16:55:23 UTC 2011


On 21 June 2011 02:59, Jack F Vogel <jfv at freebsd.org> wrote:
> Author: jfv
> Date: Mon Jun 20 22:59:29 2011
> New Revision: 223350
> URL: http://svn.freebsd.org/changeset/base/223350
>
> Log:
>  Eliminate some global tuneables in favor of adapter-specific,
>  particular flow control and dma coalesce. Also improve the
>  sysctl operation on those too.
>
>  Add IPv6 detection in the ioctl code, this was done for
>  ixgbe first, carrying that over.
>
>  Add resource ability to disable particular adapter.
>
>  Add HW TSO capability so vlans can make use of TSO

This change breaks LINT-NOINET amd64 and i386 builds.
ixgbe is broken in the same way in r222588.
Something like this should fix it (not tested).

Index: sys/dev/e1000/if_igb.c
===================================================================
--- sys/dev/e1000/if_igb.c      (revision 223490)
+++ sys/dev/e1000/if_igb.c      (working copy)
@@ -1049,8 +1049,10 @@
                        ifp->if_flags |= IFF_UP;
                        if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
                                igb_init(adapter);
+#ifdef INET
                        if (!(ifp->if_flags & IFF_NOARP))
                                arp_ifinit(ifp, ifa);
+#endif
                } else
 #endif
                        error = ether_ioctl(ifp, command, data);


-- 
wbr,
pluknet


More information about the svn-src-head mailing list