|
@@ -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. */
|
|
|
-static int talk_to_backend(struct xenbus_device *dev,
|
|
|
+static int talk_to_netback(struct xenbus_device *dev,
|
|
|
struct netfront_info *info)
|
|
|
{
|
|
|
const char *message;
|
|
@@ -1545,7 +1545,7 @@ static int xennet_connect(struct net_device *dev)
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
|
|
|
- err = talk_to_backend(np->xbdev, np);
|
|
|
+ err = talk_to_netback(np->xbdev, np);
|
|
|
if (err)
|
|
|
return err;
|
|
|
|
|
@@ -1599,7 +1599,7 @@ static int xennet_connect(struct net_device *dev)
|
|
|
/**
|
|
|
* 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)
|
|
|
{
|
|
|
struct netfront_info *np = dev_get_drvdata(&dev->dev);
|
|
@@ -1801,7 +1801,7 @@ static struct xenbus_driver netfront_driver = {
|
|
|
.probe = netfront_probe,
|
|
|
.remove = __devexit_p(xennet_remove),
|
|
|
.resume = netfront_resume,
|
|
|
- .otherend_changed = backend_changed,
|
|
|
+ .otherend_changed = netback_changed,
|
|
|
};
|
|
|
|
|
|
static int __init netif_init(void)
|