Attachment 185741 Details for Bug 220698 – make vlan_hwcsum and wol flags changeable

[patch] make vlan_hwcsum and wol flags changeable

iflib.c_vlanhwcsum.diff (text/plain), 1.28 KB, created by Kaho Toshikazu on 2017-08-25 06:15:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kaho Toshikazu

Created: 2017-08-25 06:15:27 UTC

Size: 1.28 KB

patch

obsolete

>Index: sys/net/iflib.c
>===================================================================
>--- sys/net/iflib.c	(revision 322833)
>+++ sys/net/iflib.c	(working copy)
>@@ -3734,9 +3734,10 @@
> }
> 
> 
>-#define IFCAP_FLAGS (IFCAP_TXCSUM_IPV6 | IFCAP_RXCSUM_IPV6 | IFCAP_HWCSUM | IFCAP_LRO | \
>-		     IFCAP_TSO4 | IFCAP_TSO6 | IFCAP_VLAN_HWTAGGING | IFCAP_HWSTATS | \
>-		     IFCAP_VLAN_MTU | IFCAP_VLAN_HWFILTER | IFCAP_VLAN_HWTSO)
>+#define IFCAP_FLAGS (IFCAP_HWCSUM_IPV6 | IFCAP_HWCSUM | IFCAP_LRO | \
>+		     IFCAP_TSO | IFCAP_VLAN_HWTAGGING | IFCAP_HWSTATS | \
>+		     IFCAP_VLAN_MTU | IFCAP_VLAN_HWFILTER | \
>+		     IFCAP_VLAN_HWTSO | IFCAP_VLAN_HWCSUM)
> 
> static int
> iflib_if_ioctl(if_t ifp, u_long command, caddr_t data)
>@@ -3856,15 +3857,12 @@
> 		mask = ifr->ifr_reqcap ^ if_getcapenable(ifp);
> 		setmask = 0;
> #ifdef TCP_OFFLOAD
>-		setmask |= mask & (IFCAP_TOE4|IFCAP_TOE6);
>+		setmask |= (mask & IFCAP_TOE);
> #endif
> 		setmask |= (mask & IFCAP_FLAGS);
> 
> 		if (setmask  & (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6))
> 			setmask |= (IFCAP_RXCSUM | IFCAP_RXCSUM_IPV6);
>-		if ((mask & IFCAP_WOL) &&
>-		    (if_getcapabilities(ifp) & IFCAP_WOL) != 0)
>-			setmask |= (mask & (IFCAP_WOL_MCAST|IFCAP_WOL_MAGIC));
> 		if_vlancap(ifp);
> 		/*
> 		 * want to ensure that traffic has stopped before we change any of the flags

Actions: View | Diff

Attachments on bug 220698: 184318 | 185741