From ac06546b484d4f7c45aee1acfe1a11f28655c204 Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Sat, 22 Oct 2011 05:18:10 +0000 Subject: [PATCH] --- yaml --- r: 273525 b: refs/heads/master c: 243559f436f26b571ea3a4e70ff082892dc58f16 h: refs/heads/master i: 273523: 7fc8df166d0b8b224eca1eec4a7ff76f9f0fdbb9 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/e100.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index dae32261b3df..6d71b67010dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34c9ef8bc66e21bdecb215b2fb7d93092468d27d +refs/heads/master: 243559f436f26b571ea3a4e70ff082892dc58f16 diff --git a/trunk/drivers/net/ethernet/intel/e100.c b/trunk/drivers/net/ethernet/intel/e100.c index ae17cd1a907f..5a2fdf7a00c8 100644 --- a/trunk/drivers/net/ethernet/intel/e100.c +++ b/trunk/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);