[PATCH v21 097/100] c/r: Add loopback checkpoint support (v2)
in [Kernel]
|
Prev: [PATCH v21 077/100] c/r: [pty 2/2] support for pseudo terminals
Next: [PATCH v21 100/100] c/r: add an entry for checkpoint/restart in MAINTAINERS
From: Oren Laadan on 1 May 2010 10:50 From: Dan Smith <danms(a)us.ibm.com> Adds a small ndo_checkpoint() handler for loopback devices to write the name and addresses like other interfaces. Changelog[v21]: - Unbreak compiling with CONFIG_CHECKPOINT=n or CONFIG_NET_NS=n Changes in v2: - Add CONFIG_CHECKPOINT around the handler Cc: netdev(a)vger.kernel.org Signed-off-by: Dan Smith <danms(a)us.ibm.com> Acked-by: David S. Miller <davem(a)davemloft.net> Acked-by: Serge Hallyn <serue(a)us.ibm.com> Acked-by: Oren Laadan <orenl(a)cs.columbia.edu> --- drivers/net/loopback.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 42 insertions(+), 3 deletions(-) diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index 72b7949..9a958a8 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -155,10 +155,49 @@ static void loopback_dev_free(struct net_device *dev) free_netdev(dev); } +#ifdef CONFIG_NETNS_CHECKPOINT +#include <linux/checkpoint.h> +#include <linux/checkpoint_hdr.h> + +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; +} +#endif 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, +#ifdef CONFIG_NETNS_CHECKPOINT + .ndo_checkpoint = loopback_checkpoint, +#endif }; /* -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |