diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-15 10:06:42 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-15 10:06:42 +0100 |
| commit | 4aa96ccf9ee35cdbd0d423e87a4d551019570218 (patch) | |
| tree | dca6322681df2e8f33f65c07defce24db68f645c /drivers/net/8139too.c | |
| parent | cb5fd904f0f14866ab76ec1f6ca3469896e4e2cf (diff) | |
| parent | 8f2ffa00fb3c05ec0659cd7b056c4e8e106072f1 (diff) | |
Merge branch 'kprobes-thumb' of git://git.yxit.co.uk/linux into devel-stable
Diffstat (limited to 'drivers/net/8139too.c')
| -rw-r--r-- | drivers/net/8139too.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index 98517a37347..e3bad8247fd 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c @@ -992,6 +992,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev, * features */ dev->features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HIGHDMA; + dev->vlan_features = dev->features; dev->irq = pdev->irq; |