Commit f502bf2b authored by Ian Campbell's avatar Ian Campbell Committed by David S. Miller
Browse files

xen: use less generic names in netfront driver. 



All Xen frontend drivers have a couple of identically named functions which
makes figuring out which device went wrong from a stacktrace harder than it
needs to be. Rename them to something specificto the device type.

Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e88c64f0

drivers/net/xen-netfront.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1395,7 +1395,7 @@ static int setup_netfront(struct xenbus_device *dev, struct netfront_info *info) 
}

}





/* Common code used when first setting up, and when resuming. */

/* Common code used when first setting up, and when resuming. */

static int talk_to_backend(struct xenbus_device *dev,

static int talk_to_netback(struct xenbus_device *dev,

			   struct netfront_info *info)

			   struct netfront_info *info)

{

{

	const char *message;

	const char *message;
@@ -1545,7 +1545,7 @@ static int xennet_connect(struct net_device *dev) 
		return -ENODEV;

		return -ENODEV;

	}

	}





	err = talk_to_backend(np->xbdev, np);

	err = talk_to_netback(np->xbdev, np);

	if (err)

	if (err)

		return err;

		return err;
@@ -1599,7 +1599,7 @@ static int xennet_connect(struct net_device *dev) 
/**

/**

 * Callback received when the backend's state changes.

 * Callback received when the backend's state changes.

 */

 */

static void backend_changed(struct xenbus_device *dev,

static void netback_changed(struct xenbus_device *dev,

			    enum xenbus_state backend_state)

			    enum xenbus_state backend_state)

{

{

	struct netfront_info *np = dev_get_drvdata(&dev->dev);

	struct netfront_info *np = dev_get_drvdata(&dev->dev);
@@ -1801,7 +1801,7 @@ static struct xenbus_driver netfront_driver = { 
	.probe = netfront_probe,

	.probe = netfront_probe,

	.remove = __devexit_p(xennet_remove),

	.remove = __devexit_p(xennet_remove),

	.resume = netfront_resume,

	.resume = netfront_resume,

	.otherend_changed = backend_changed,

	.otherend_changed = netback_changed,

};

};





static int __init netif_init(void)

static int __init netif_init(void)