diff mbox

net: 8139too: Initial necessary vlan_features to support vlan

Message ID 4E0ED194.2030103@cn.fujitsu.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Shan Wei July 2, 2011, 8:06 a.m. UTC
Offload setting of vlan device requires
vlan_features to be initialed.

Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
---
 drivers/net/8139too.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Comments

Francois Romieu July 2, 2011, 9:51 a.m. UTC | #1
Shan Wei <shanwei@cn.fujitsu.com> :
> Offload setting of vlan device requires
> vlan_features to be initialed.
[...]
> @@ -993,6 +993,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;

        /* note: the hardware is not capable of sg/csum/highdma, however
         * through the use of skb_copy_and_csum_dev we enable these
         * features
         */

The commit message is a bit misleading wrt hardware capabilities but the
patch makes sense.

Acked-by: Francois Romieu <romieu@fr.zoreil.com>

--
Ueimor
--
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
David Miller July 4, 2011, 2:54 a.m. UTC | #2
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Sat, 2 Jul 2011 11:51:38 +0200

> Shan Wei <shanwei@cn.fujitsu.com> :
>> Offload setting of vlan device requires
>> vlan_features to be initialed.
> [...]
>> @@ -993,6 +993,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;
> 
>         /* note: the hardware is not capable of sg/csum/highdma, however
>          * through the use of skb_copy_and_csum_dev we enable these
>          * features
>          */
> 
> The commit message is a bit misleading wrt hardware capabilities but the
> patch makes sense.
> 
> Acked-by: Francois Romieu <romieu@fr.zoreil.com>

Applied.
--
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
diff mbox

Patch

diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index ed6355c..c2672c6 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -993,6 +993,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;