| Submitter | Jeff Kirsher |
|---|---|
| Date | Oct. 11, 2008, 1:34 a.m. |
| Message ID | <20081011013458.11804.35278.stgit@gitlost.lost> |
| Download | mbox | patch |
| Permalink | /patch/3906/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Date: Fri, 10 Oct 2008 18:34:58 -0700 > From: Patrick McHardy <kaber@trash.net> > > This patch changes e1000 to set vlan_features so TSO and CSUM > offload can be used by VLAN devices, similar as with the other > Intel drivers. > > Signed-off-by: Patrick McHardy <kaber@trash.net> > Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Applied to net-2.6, thanks. I'm applying this because Patrick submitted this a long time ago in the same form that it had in this final submission. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index ad6da7b..dd5ea4e 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -1053,6 +1053,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev, netdev->features |= NETIF_F_LLTX; + netdev->vlan_features |= NETIF_F_TSO; + netdev->vlan_features |= NETIF_F_TSO6; + netdev->vlan_features |= NETIF_F_HW_CSUM; + netdev->vlan_features |= NETIF_F_SG; + adapter->en_mng_pt = e1000_enable_mng_pass_thru(hw); /* initialize eeprom parameters */