Module Name: src
Committed By: snj
Date: Sun May 3 18:01:01 UTC 2009
Modified Files:
src/sys/net [netbsd-5]: if_vlan.c
Log Message:
Pull up following revision(s) (requested by darran in ticket #644):
sys/net/if_vlan.c: revision 1.63
Also inherit the parent's TCP segmentation offload capability.
Note the vlan interface does not see updates to the parents capabilities
so if, for example, TSO is on in both, then turned off in the parent it
will remain on in the vlan interface.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.60.4.1 src/sys/net/if_vlan.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.60 src/sys/net/if_vlan.c:1.60.4.1
--- src/sys/net/if_vlan.c:1.60 Sat Oct 11 17:19:41 2008
+++ src/sys/net/if_vlan.c Sun May 3 18:01:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vlan.c,v 1.60 2008/10/11 17:19:41 bouyer Exp $ */
+/* $NetBSD: if_vlan.c,v 1.60.4.1 2009/05/03 18:01:01 snj Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.60 2008/10/11 17:19:41 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.60.4.1 2009/05/03 18:01:01 snj Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -316,11 +316,13 @@
/*
* If the parent interface can do hardware-assisted
* VLAN encapsulation, then propagate its hardware-
- * assisted checksumming flags.
+ * assisted checksumming flags and tcp segmentation
+ * offload.
*/
if (ec->ec_capabilities & ETHERCAP_VLAN_HWTAGGING)
ifp->if_capabilities = p->if_capabilities &
- (IFCAP_CSUM_IPv4_Tx|IFCAP_CSUM_IPv4_Rx|
+ (IFCAP_TSOv4 |
+ IFCAP_CSUM_IPv4_Tx|IFCAP_CSUM_IPv4_Rx|
IFCAP_CSUM_TCPv4_Tx|IFCAP_CSUM_TCPv4_Rx|
IFCAP_CSUM_UDPv4_Tx|IFCAP_CSUM_UDPv4_Rx|
IFCAP_CSUM_TCPv6_Tx|IFCAP_CSUM_TCPv6_Rx|
