xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xensource.com
Cc: Jeremy Fitzhardinge <jeremy@goop.org>,
	Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH 2/6] xen: netback: factor disconnect from backend into new function.
Date: Tue, 23 Feb 2010 16:47:07 +0000	[thread overview]
Message-ID: <1266943630-17002-2-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1266943615.11737.6467.camel@zakaz.uk.xensource.com>

Makes subsequent patches cleaner.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 drivers/xen/netback/xenbus.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/xen/netback/xenbus.c b/drivers/xen/netback/xenbus.c
index 9022c99..b114aa4 100644
--- a/drivers/xen/netback/xenbus.c
+++ b/drivers/xen/netback/xenbus.c
@@ -213,6 +213,16 @@ static void backend_create_netif(struct backend_info *be)
 }
 
 
+static void disconnect_backend(struct xenbus_device *dev)
+{
+	struct backend_info *be = dev_get_drvdata(&dev->dev);
+
+	if (be->netif) {
+		netif_disconnect(be->netif);
+		be->netif = NULL;
+	}
+}
+
 /**
  * Callback received when the frontend's state changes.
  */
@@ -246,11 +256,9 @@ static void frontend_changed(struct xenbus_device *dev,
 		break;
 
 	case XenbusStateClosing:
-		if (be->netif) {
+		if (be->netif)
 			kobject_uevent(&dev->dev.kobj, KOBJ_OFFLINE);
-			netif_disconnect(be->netif);
-			be->netif = NULL;
-		}
+		disconnect_backend(dev);
 		xenbus_switch_state(dev, XenbusStateClosing);
 		break;
 
-- 
1.5.6.5

  parent reply	other threads:[~2010-02-23 16:47 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-23 16:46 [GIT] netback fixes from XCP kernel tree Ian Campbell
2010-02-23 16:47 ` [PATCH 1/6] xen: netback: remove unused xen_network_done code Ian Campbell
2010-02-23 16:47 ` Ian Campbell [this message]
2010-02-23 16:47 ` [PATCH 3/6] xen: netback: wait for hotplug scripts to complete before signalling connected to frontend Ian Campbell
2010-02-23 16:47 ` [PATCH 4/6] xen/netback: Always pull through PKT_PROT_LEN bytes into the linear part of an skb Ian Campbell
2010-02-24  8:28   ` Jan Beulich
2010-02-24  8:55     ` Ian Campbell
2010-02-24  9:23       ` [PATCH 4/6] xen/netback: Always pull throughPKT_PROT_LEN " James Harper
2010-02-24  9:56         ` Ian Campbell
2010-02-23 16:47 ` [PATCH 5/6] xen/netback: try to pull a minimum of 72 bytes into the skb data area Ian Campbell
2010-02-23 17:04   ` Ian Campbell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1266943630-17002-2-git-send-email-ian.campbell@citrix.com \
    --to=ian.campbell@citrix.com \
    --cc=jeremy@goop.org \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).