From patchwork Tue Feb 9 21:25:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Smith X-Patchwork-Id: 44950 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DAA33B7DE1 for ; Wed, 10 Feb 2010 08:27:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751578Ab0BIV1G (ORCPT ); Tue, 9 Feb 2010 16:27:06 -0500 Received: from stein.danplanet.com ([71.245.107.83]:45110 "EHLO stein.danplanet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751401Ab0BIV1D (ORCPT ); Tue, 9 Feb 2010 16:27:03 -0500 Received: from guaranine.danplanet.com (ldap.danplanet.com [71.245.107.82]) by stein.danplanet.com (Postfix) with ESMTP id 4592D107EB6; Tue, 9 Feb 2010 13:25:06 -0800 (PST) Received: by guaranine.danplanet.com (Postfix, from userid 1000) id DD2CB2D969; Tue, 9 Feb 2010 13:25:13 -0800 (PST) From: Dan Smith To: containers@lists.osdl.org Cc: netdev@vger.kernel.org Subject: [PATCH 4/4] Add loopback checkpoint support Date: Tue, 9 Feb 2010 13:25:13 -0800 Message-Id: <1265750713-15749-5-git-send-email-danms@us.ibm.com> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1265750713-15749-1-git-send-email-danms@us.ibm.com> References: <1265750713-15749-1-git-send-email-danms@us.ibm.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Adds a small ndo_checkpoint() handler for loopback devices to write the name and addresses like other interfaces. Signed-off-by: Dan Smith --- drivers/net/loopback.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 38 insertions(+), 3 deletions(-) diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index b9fcc98..816a527 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -57,6 +57,8 @@ #include #include #include +#include +#include #include struct pcpu_lstats { @@ -153,10 +155,43 @@ static void loopback_dev_free(struct net_device *dev) free_netdev(dev); } +static int loopback_checkpoint(struct ckpt_ctx *ctx, struct net_device *dev) +{ + struct ckpt_hdr_netdev *h; + struct ckpt_netdev_addr *addrs; + int ret; + + h = ckpt_netdev_base(ctx, dev, &addrs); + if (IS_ERR(h)) + return PTR_ERR(h); + + h->type = CKPT_NETDEV_LO; + + ret = ckpt_write_obj(ctx, (struct ckpt_hdr *)h); + if (ret < 0) + goto out; + + ret = ckpt_write_buffer(ctx, dev->name, IFNAMSIZ); + if (ret < 0) + goto out; + + if (h->inet_addrs > 0) { + int len = (sizeof(struct ckpt_netdev_addr) * h->inet_addrs); + ret = ckpt_write_buffer(ctx, addrs, len); + } + + out: + ckpt_hdr_put(ctx, h); + kfree(addrs); + + return ret; +} + static const struct net_device_ops loopback_ops = { - .ndo_init = loopback_dev_init, - .ndo_start_xmit= loopback_xmit, - .ndo_get_stats = loopback_get_stats, + .ndo_init = loopback_dev_init, + .ndo_start_xmit = loopback_xmit, + .ndo_get_stats = loopback_get_stats, + .ndo_checkpoint = loopback_checkpoint, }; /*