summaryrefslogtreecommitdiff
path: root/drivers/net/s2io.h
diff options
context:
space:
mode:
authorBreno Leitao <leitao@linux.vnet.ibm.com>2008-09-04 17:52:54 -0300
committerJeff Garzik <jgarzik@redhat.com>2008-09-24 18:49:04 -0400
commitcd0fce0322cd10ab39ace584be12f809988a1b9a (patch)
tree0eb4f09a6b9c79c87c222df11e9b89064b364038 /drivers/net/s2io.h
parent52845c3fd80c09f8ceac54513ae9cffac219cff7 (diff)
downloadlinux-3.10-cd0fce0322cd10ab39ace584be12f809988a1b9a.tar.gz
linux-3.10-cd0fce0322cd10ab39ace584be12f809988a1b9a.tar.bz2
linux-3.10-cd0fce0322cd10ab39ace584be12f809988a1b9a.zip
s2io: Fix enabling VLAN tag stripping at driver initialization
VLAN doesn't work except if you'd opened the interface in promiscuous mode before. This happens because VLAN tag stripping is not correctly marked as enabled at device startup Also, the vlan_strip_flag field was moved to the private network structure. Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/s2io.h')
-rw-r--r--drivers/net/s2io.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 6722a2f7d09..55cb943f23f 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -962,6 +962,7 @@ struct s2io_nic {
int task_flag;
unsigned long long start_time;
struct vlan_group *vlgrp;
+ int vlan_strip_flag;
#define MSIX_FLG 0xA5
int num_entries;
struct msix_entry *entries;