ia64/xen-unstable

changeset 11800:d2f13c8b0819

[NET] front: No need to read handle field from xenstore. It's not used.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Fri Oct 13 17:07:39 2006 +0100 (2006-10-13)
parents 49d096ef3d76
children efea4c3b8bcc
files linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Fri Oct 13 10:58:29 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Fri Oct 13 17:07:39 2006 +0100
     1.3 @@ -141,7 +141,6 @@ struct netfront_info {
     1.4  	spinlock_t   tx_lock;
     1.5  	spinlock_t   rx_lock;
     1.6  
     1.7 -	unsigned int handle;
     1.8  	unsigned int evtchn, irq;
     1.9  	unsigned int copying_receiver;
    1.10  
    1.11 @@ -232,7 +231,7 @@ static inline grant_ref_t xennet_get_rx_
    1.12  
    1.13  static int talk_to_backend(struct xenbus_device *, struct netfront_info *);
    1.14  static int setup_device(struct xenbus_device *, struct netfront_info *);
    1.15 -static struct net_device *create_netdev(int, int, struct xenbus_device *);
    1.16 +static struct net_device *create_netdev(int, struct xenbus_device *);
    1.17  
    1.18  static void netfront_closing(struct xenbus_device *);
    1.19  
    1.20 @@ -274,13 +273,7 @@ static int __devinit netfront_probe(stru
    1.21  	int err;
    1.22  	struct net_device *netdev;
    1.23  	struct netfront_info *info;
    1.24 -	unsigned int handle, feature_rx_copy, feature_rx_flip, use_copy;
    1.25 -
    1.26 -	err = xenbus_scanf(XBT_NIL, dev->nodename, "handle", "%u", &handle);
    1.27 -	if (err != 1) {
    1.28 -		xenbus_dev_fatal(dev, err, "reading handle");
    1.29 -		return err;
    1.30 -	}
    1.31 +	unsigned int feature_rx_copy, feature_rx_flip, use_copy;
    1.32  
    1.33  	err = xenbus_scanf(XBT_NIL, dev->otherend, "feature-rx-copy", "%u",
    1.34  			   &feature_rx_copy);
    1.35 @@ -299,7 +292,7 @@ static int __devinit netfront_probe(stru
    1.36  	use_copy = (MODPARM_rx_copy && feature_rx_copy) ||
    1.37  		(MODPARM_rx_flip && !feature_rx_flip);
    1.38  
    1.39 -	netdev = create_netdev(handle, use_copy, dev);
    1.40 +	netdev = create_netdev(use_copy, dev);
    1.41  	if (IS_ERR(netdev)) {
    1.42  		err = PTR_ERR(netdev);
    1.43  		xenbus_dev_fatal(dev, err, "creating netdev");
    1.44 @@ -1882,7 +1875,7 @@ static void network_set_multicast_list(s
    1.45  }
    1.46  
    1.47  static struct net_device * __devinit
    1.48 -create_netdev(int handle, int copying_receiver, struct xenbus_device *dev)
    1.49 +create_netdev(int copying_receiver, struct xenbus_device *dev)
    1.50  {
    1.51  	int i, err = 0;
    1.52  	struct net_device *netdev = NULL;
    1.53 @@ -1896,7 +1889,6 @@ create_netdev(int handle, int copying_re
    1.54  	}
    1.55  
    1.56  	np                   = netdev_priv(netdev);
    1.57 -	np->handle           = handle;
    1.58  	np->xbdev            = dev;
    1.59  	np->copying_receiver = copying_receiver;
    1.60