| Message ID | 1303330438.19336.57.camel@localhost.localdomain (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/20/2011 01:13 PM, Shirley Ma wrote: > Signed-off-by: Shirley Ma <xma@us.ibm.com> > --- > > drivers/net/cxgb3/cxgb3_main.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c > index 9108931..93a1101 100644 > --- a/drivers/net/cxgb3/cxgb3_main.c > +++ b/drivers/net/cxgb3/cxgb3_main.c > @@ -3313,7 +3313,7 @@ static int __devinit init_one(struct pci_dev *pdev, > netdev->features |= NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO; > netdev->features |= NETIF_F_GRO; > if (pci_using_dac) > - netdev->features |= NETIF_F_HIGHDMA; > + netdev->features |= NETIF_F_HIGHDMA | NETIF_F_ZEROCOPY; > > netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; > netdev->netdev_ops = &cxgb_netdev_ops; The features handling has been reworked in net-next and patches like this won't apply as the code you're patching has changed. Also core code now does a lot of the related work and you'll need to tell it what to do with any new flags. What properties does a device or driver need to meet to set this flag? It seems to be set a bit too unconditionally. For example, does it work if one disables scatter/gather? -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2011-04-20 at 13:52 -0700, Dimitris Michailidis wrote: > The features handling has been reworked in net-next and patches like > this > won't apply as the code you're patching has changed. Also core code > now > does a lot of the related work and you'll need to tell it what to do > with > any new flags. Ok, will do. > What properties does a device or driver need to meet to set this flag? > It > seems to be set a bit too unconditionally. For example, does it work > if one > disables scatter/gather? This flag can be ON when HIGHDMA and scatter/gather support. I will modify the patch to make it conditionally. thanks Shirley -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2011-04-20 at 13:58 -0700, Shirley Ma wrote: > This flag can be ON when HIGHDMA and scatter/gather support. I will > modify the patch to make it conditionally. Double checked, it only needs HIGHDMA condition, not scatter/gather. thanks Shirley -- To unsubscribe from this list: send the line "unsubscribe kvm" 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/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 9108931..93a1101 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c @@ -3313,7 +3313,7 @@ static int __devinit init_one(struct pci_dev *pdev, netdev->features |= NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO; netdev->features |= NETIF_F_GRO; if (pci_using_dac) - netdev->features |= NETIF_F_HIGHDMA; + netdev->features |= NETIF_F_HIGHDMA | NETIF_F_ZEROCOPY; netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; netdev->netdev_ops = &cxgb_netdev_ops;
Signed-off-by: Shirley Ma <xma@us.ibm.com> --- drivers/net/cxgb3/cxgb3_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html