Message ID | 1374040880-20468-1-git-send-email-haiyangz@microsoft.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Haiyang Zhang <haiyangz@microsoft.com> Date: Tue, 16 Jul 2013 23:01:20 -0700 > SG mode is not currently supported by netvsc, so remove this flag for now. > Otherwise, it will be unconditionally enabled by commit ec5f0615642 > "Kill link between CSUM and SG features" > Previously, the SG feature is disabled because CSUM is not set here. > > Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> > Reviewed-by: K. Y. Srinivasan <kys@microsoft.com> Applied and queued up for -stable, thanks. -- 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
> -----Original Message----- > From: Haiyang Zhang [mailto:haiyangz@microsoft.com] > Sent: Wednesday, July 17, 2013 2:01 AM > To: davem@davemloft.net; netdev@vger.kernel.org > Cc: Haiyang Zhang; KY Srinivasan; olaf@aepfle.de; jasowang@redhat.com; linux- > kernel@vger.kernel.org; devel@linuxdriverproject.org > Subject: [PATCH net] hyperv: Fix the NETIF_F_SG flag setting in netvsc > > SG mode is not currently supported by netvsc, so remove this flag for now. > Otherwise, it will be unconditionally enabled by commit ec5f0615642 > "Kill link between CSUM and SG features" > Previously, the SG feature is disabled because CSUM is not set here. > > Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> > Reviewed-by: K. Y. Srinivasan <kys@microsoft.com> We would need to apply this patch to 3.9 and 3.10 as well that are currently broken. K. Y > --- > drivers/net/hyperv/netvsc_drv.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c > index 4dccead..23a0fff 100644 > --- a/drivers/net/hyperv/netvsc_drv.c > +++ b/drivers/net/hyperv/netvsc_drv.c > @@ -431,8 +431,8 @@ static int netvsc_probe(struct hv_device *dev, > net->netdev_ops = &device_ops; > > /* TODO: Add GSO and Checksum offload */ > - net->hw_features = NETIF_F_SG; > - net->features = NETIF_F_SG | NETIF_F_HW_VLAN_CTAG_TX; > + net->hw_features = 0; > + net->features = NETIF_F_HW_VLAN_CTAG_TX; > > SET_ETHTOOL_OPS(net, ðtool_ops); > SET_NETDEV_DEV(net, &dev->device); > -- > 1.7.4.1 > > -- 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
From: KY Srinivasan <kys@microsoft.com> Date: Wed, 17 Jul 2013 11:40:41 +0000 > > >> -----Original Message----- >> From: Haiyang Zhang [mailto:haiyangz@microsoft.com] >> Sent: Wednesday, July 17, 2013 2:01 AM >> To: davem@davemloft.net; netdev@vger.kernel.org >> Cc: Haiyang Zhang; KY Srinivasan; olaf@aepfle.de; jasowang@redhat.com; linux- >> kernel@vger.kernel.org; devel@linuxdriverproject.org >> Subject: [PATCH net] hyperv: Fix the NETIF_F_SG flag setting in netvsc >> >> SG mode is not currently supported by netvsc, so remove this flag for now. >> Otherwise, it will be unconditionally enabled by commit ec5f0615642 >> "Kill link between CSUM and SG features" >> Previously, the SG feature is disabled because CSUM is not set here. >> >> Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> >> Reviewed-by: K. Y. Srinivasan <kys@microsoft.com> > > We would need to apply this patch to 3.9 and 3.10 as well that are currently broken. I have already queued this patch up for -stable submission. -- 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 --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 4dccead..23a0fff 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -431,8 +431,8 @@ static int netvsc_probe(struct hv_device *dev, net->netdev_ops = &device_ops; /* TODO: Add GSO and Checksum offload */ - net->hw_features = NETIF_F_SG; - net->features = NETIF_F_SG | NETIF_F_HW_VLAN_CTAG_TX; + net->hw_features = 0; + net->features = NETIF_F_HW_VLAN_CTAG_TX; SET_ETHTOOL_OPS(net, ðtool_ops); SET_NETDEV_DEV(net, &dev->device);