Merge v2.6.37-rc8 into powerpc/next

1 files changed, 11 insertions, 9 deletions

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index b50fedcef8ac..cdbeec9f83ea 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -66,8 +66,8 @@ struct netfront_cb {
 
 #define GRANT_INVALID_REF       0
 
-#define NET_TX_RING_SIZE __RING_SIZE((struct xen_netif_tx_sring *)0, PAGE_SIZE)
-#define NET_RX_RING_SIZE __RING_SIZE((struct xen_netif_rx_sring *)0, PAGE_SIZE)
+#define NET_TX_RING_SIZE __CONST_RING_SIZE(xen_netif_tx, PAGE_SIZE)
+#define NET_RX_RING_SIZE __CONST_RING_SIZE(xen_netif_rx, PAGE_SIZE)
 #define TX_MAX_TARGET min_t(int, NET_RX_RING_SIZE, 256)
 
 struct netfront_info {
@@ -135,7 +135,7 @@ static void skb_entry_set_link(union skb_entry *list, unsigned short id)
 static int skb_entry_is_link(const union skb_entry *list)
 {
         BUILD_BUG_ON(sizeof(list->skb) != sizeof(list->link));
-        return ((unsigned long)list->skb < PAGE_OFFSET);
+        return (unsigned long)list->skb < PAGE_OFFSET;
 }
 
 /*
@@ -203,8 +203,8 @@ static void rx_refill_timeout(unsigned long data)
 
 static int netfront_tx_slot_available(struct netfront_info *np)
 {
-        return ((np->tx.req_prod_pvt - np->tx.rsp_cons) <
-                (TX_MAX_TARGET - MAX_SKB_FRAGS - 2));
+        return (np->tx.req_prod_pvt - np->tx.rsp_cons) <
+                (TX_MAX_TARGET - MAX_SKB_FRAGS - 2);
 }
 
 static void xennet_maybe_wake_tx(struct net_device *dev)
@@ -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);
@@ -1610,6 +1610,8 @@ static void backend_changed(struct xenbus_device *dev,
         switch (backend_state) {
         case XenbusStateInitialising:
         case XenbusStateInitialised:
+        case XenbusStateReconfiguring:
+        case XenbusStateReconfigured:
         case XenbusStateConnected:
         case XenbusStateUnknown:
         case XenbusStateClosed:
@@ -1801,7 +1803,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)