Message ID | 1301920159.23887.96.camel@zakaz.uk.xensource.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Ian Campbell <Ian.Campbell@eu.citrix.com> Date: Mon, 4 Apr 2011 13:29:19 +0100 >>From 0b56469abe56efae415b4603ef508ce9aec0e4c1 Mon Sep 17 00:00:00 2001 > From: Ian Campbell <ian.campbell@citrix.com> > Date: Mon, 4 Apr 2011 10:58:50 +0100 > Subject: [PATCH] xen: netfront: assume all hw features are available until backend connection setup > > We need to assume that all features will be available when registering the > netdev otherwise they are ommitted from the initial set of > dev->wanted_features. When we connect to the backed we reduce the set as > necessary due to the call to netdev_update_features() in xennet_connect(). > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> I've applied this, thanks Ian. -- 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/xen-netfront.c b/drivers/net/xen-netfront.c index 0cfe4cc..db9a763 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -1251,6 +1251,14 @@ static struct net_device * __devinit xennet_create_dev(struct xenbus_device *dev NETIF_F_GSO_ROBUST; netdev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_TSO; + /* + * Assume that all hw features are available for now. This set + * will be adjusted by the call to netdev_update_features() in + * xennet_connect() which is the earliest point where we can + * negotiate with the backend regarding supported features. + */ + netdev->features |= netdev->hw_features; + SET_ETHTOOL_OPS(netdev, &xennet_ethtool_ops); SET_NETDEV_DEV(netdev, &dev->dev);