diff --git a/[refs] b/[refs] index ed492db2e2a5..6044d3aea1ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa395145165cb06a0d0885221bbe0ce4a564391d +refs/heads/master: e4fc9d15db72c8de7d4988e9f419b63b923e1d1d diff --git a/trunk/drivers/net/niu.c b/trunk/drivers/net/niu.c index ef940226ee22..493e25cf1014 100644 --- a/trunk/drivers/net/niu.c +++ b/trunk/drivers/net/niu.c @@ -9838,7 +9838,7 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev, } } - dev->features |= (NETIF_F_SG | NETIF_F_HW_CSUM); + dev->features |= (NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_GRO); np->regs = pci_ioremap_bar(pdev, 0); if (!np->regs) {