diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-03 21:52:51 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-03 21:52:51 -0400 |
| commit | 5b67b3c04d73ee998a754d006e53131a7c909a46 (patch) | |
| tree | b7e2e502750a10548211b8403f9cf224faf513f2 /drivers/net/ethernet/intel/e100.c | |
| parent | eea49cc9009767dfbafd673ee577854454b52e0d (diff) | |
| parent | c1a7e1ebc17a9243d99ba0432d1138d74114dea7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
Diffstat (limited to 'drivers/net/ethernet/intel/e100.c')
| -rw-r--r-- | drivers/net/ethernet/intel/e100.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c index ae17cd1a907f..5a2fdf7a00c8 100644 --- a/drivers/net/ethernet/intel/e100.c +++ b/drivers/net/ethernet/intel/e100.c @@ -2810,6 +2810,10 @@ static int __devinit e100_probe(struct pci_dev *pdev, e100_get_defaults(nic); + /* D100 MAC doesn't allow rx of vlan packets with normal MTU */ + if (nic->mac < mac_82558_D101_A4) + netdev->features |= NETIF_F_VLAN_CHALLENGED; + /* locks must be initialized before calling hw_reset */ spin_lock_init(&nic->cb_lock); spin_lock_init(&nic->cmd_lock); |