From 247ff98ac55801f39bef315445a7c5c3c7f1f9d6 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 7 Sep 2010 13:49:44 -0700 Subject: [PATCH] --- yaml --- r: 210582 b: refs/heads/master c: de2b96f1212722eb0af80bf9a029d03d8fc673a9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/via-velocity.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2f9fb0d62375..1198d2031046 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f86b325189e0a53c97bf86cff0c8b02ff624934 +refs/heads/master: de2b96f1212722eb0af80bf9a029d03d8fc673a9 diff --git a/trunk/drivers/net/via-velocity.c b/trunk/drivers/net/via-velocity.c index fd69095ef6e3..f53412368ce1 100644 --- a/trunk/drivers/net/via-velocity.c +++ b/trunk/drivers/net/via-velocity.c @@ -2824,7 +2824,7 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi netif_napi_add(dev, &vptr->napi, velocity_poll, VELOCITY_NAPI_WEIGHT); dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_FILTER | - NETIF_F_HW_VLAN_RX | NETIF_F_IP_CSUM | NETIF_F_SG; + NETIF_F_HW_VLAN_RX | NETIF_F_IP_CSUM; ret = register_netdev(dev); if (ret < 0)