| Message ID | 1188c5613d72850983d54f3b6d0276f3a5aa98f0.1374609949.git.cmetcalf@tilera.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, 2013-07-23 at 16:05 -0400, Chris Metcalf wrote: > Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> > --- > drivers/net/ethernet/tile/tilegx.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c > index b34fd2c..9c128ff 100644 > --- a/drivers/net/ethernet/tile/tilegx.c > +++ b/drivers/net/ethernet/tile/tilegx.c > @@ -458,7 +458,7 @@ static void tile_net_receive_skb(struct net_device *dev, struct sk_buff *skb, > /* Get RX timestamp from idesc. */ > tile_rx_timestamp(skb, idesc); > > - netif_receive_skb(skb); > + napi_gro_receive(&info->napi, skb); > > /* Update stats. */ > tile_net_stats_add(1, &dev->stats.rx_packets); > @@ -1880,6 +1880,7 @@ static void tile_net_setup(struct net_device *dev) > dev->features |= NETIF_F_HW_CSUM; > dev->features |= NETIF_F_SG; > dev->features |= NETIF_F_TSO; > + dev->features |= NETIF_F_GRO; This line should not be needed register_netdevice() does it for all devices : dev->hw_features |= NETIF_F_SOFT_FEATURES; dev->features |= NETIF_F_SOFT_FEATURES; -- 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
On 7/23/2013 5:19 PM, Eric Dumazet wrote: > On Tue, 2013-07-23 at 16:05 -0400, Chris Metcalf wrote: >> Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> >> --- >> drivers/net/ethernet/tile/tilegx.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c >> index b34fd2c..9c128ff 100644 >> --- a/drivers/net/ethernet/tile/tilegx.c >> +++ b/drivers/net/ethernet/tile/tilegx.c >> @@ -458,7 +458,7 @@ static void tile_net_receive_skb(struct net_device *dev, struct sk_buff *skb, >> /* Get RX timestamp from idesc. */ >> tile_rx_timestamp(skb, idesc); >> >> - netif_receive_skb(skb); >> + napi_gro_receive(&info->napi, skb); >> >> /* Update stats. */ >> tile_net_stats_add(1, &dev->stats.rx_packets); >> @@ -1880,6 +1880,7 @@ static void tile_net_setup(struct net_device *dev) >> dev->features |= NETIF_F_HW_CSUM; >> dev->features |= NETIF_F_SG; >> dev->features |= NETIF_F_TSO; >> + dev->features |= NETIF_F_GRO; > This line should not be needed > > register_netdevice() does it for all devices : > > dev->hw_features |= NETIF_F_SOFT_FEATURES; > dev->features |= NETIF_F_SOFT_FEATURES; Thanks; I removed the line from my tile-net-next tree so it will get pulled without it.
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c index b34fd2c..9c128ff 100644 --- a/drivers/net/ethernet/tile/tilegx.c +++ b/drivers/net/ethernet/tile/tilegx.c @@ -458,7 +458,7 @@ static void tile_net_receive_skb(struct net_device *dev, struct sk_buff *skb, /* Get RX timestamp from idesc. */ tile_rx_timestamp(skb, idesc); - netif_receive_skb(skb); + napi_gro_receive(&info->napi, skb); /* Update stats. */ tile_net_stats_add(1, &dev->stats.rx_packets); @@ -1880,6 +1880,7 @@ static void tile_net_setup(struct net_device *dev) dev->features |= NETIF_F_HW_CSUM; dev->features |= NETIF_F_SG; dev->features |= NETIF_F_TSO; + dev->features |= NETIF_F_GRO; dev->mtu = 1500; }
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com> --- drivers/net/ethernet/tile/tilegx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)