diff --git a/[refs] b/[refs] index daf7f9b1bc08..0175c78d86db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25cca5352712561fba97bd37c495593d641c1d39 +refs/heads/master: b6ca430599ea37843632b0eaa231dea5414dec25 diff --git a/trunk/drivers/net/via-velocity.c b/trunk/drivers/net/via-velocity.c index cd4e866321f8..4e47f2683b83 100644 --- a/trunk/drivers/net/via-velocity.c +++ b/trunk/drivers/net/via-velocity.c @@ -2825,7 +2825,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_HW_VLAN_RX | NETIF_F_IP_CSUM | NETIF_F_SG; ret = register_netdev(dev); if (ret < 0)