From patchwork Wed Jan 20 15:01:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Smith X-Patchwork-Id: 43297 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 2F88BB7CCD for ; Thu, 21 Jan 2010 02:32:29 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752631Ab0ATPcV (ORCPT ); Wed, 20 Jan 2010 10:32:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753239Ab0ATPcV (ORCPT ); Wed, 20 Jan 2010 10:32:21 -0500 Received: from stein.danplanet.com ([71.245.107.83]:59003 "EHLO stein.danplanet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751250Ab0ATPcU (ORCPT ); Wed, 20 Jan 2010 10:32:20 -0500 X-Greylist: delayed 1789 seconds by postgrey-1.27 at vger.kernel.org; Wed, 20 Jan 2010 10:32:20 EST Received: from guaranine.danplanet.com (gw0.danplanet.com [71.245.107.82]) by stein.danplanet.com (Postfix) with ESMTP id D9D1B107E9B; Wed, 20 Jan 2010 07:02:29 -0800 (PST) Received: by guaranine.danplanet.com (Postfix, from userid 1000) id 379FB6E9E3; Wed, 20 Jan 2010 07:01:13 -0800 (PST) From: Dan Smith To: containers@lists.osdl.org Cc: orenl@librato.com, netdev@vger.kernel.org Subject: [PATCH 2/3] Add a veth_get_peer() and veth_set_peer() functions Date: Wed, 20 Jan 2010 07:01:12 -0800 Message-Id: <1263999673-11279-3-git-send-email-danms@us.ibm.com> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1263999673-11279-1-git-send-email-danms@us.ibm.com> References: <1263999673-11279-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 This is needed for C/R. For checkpoint, we need to be able to follow the link from one veth device to its peer. For restart, we need to be able to link two veth devices we've restored to re-establish their relationship. Signed-off-by: Dan Smith Cc: netdev@vger.kernel.org --- drivers/net/veth.c | 14 ++++++++++++++ include/linux/veth.h | 5 +++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/drivers/net/veth.c b/drivers/net/veth.c index ade5b34..eb47080 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -454,6 +454,20 @@ static void veth_dellink(struct net_device *dev) unregister_netdevice(peer); } +struct net_device *veth_get_peer(struct net_device *veth) +{ + struct veth_priv *priv = netdev_priv(veth); + + return priv->peer; +} + +void veth_set_peer(struct net_device *veth, struct net_device *peer) +{ + struct veth_priv *priv = netdev_priv(veth); + + priv->peer = peer; +} + static const struct nla_policy veth_policy[VETH_INFO_MAX + 1]; static struct rtnl_link_ops veth_link_ops = { diff --git a/include/linux/veth.h b/include/linux/veth.h index 3354c1e..eee059d 100644 --- a/include/linux/veth.h +++ b/include/linux/veth.h @@ -9,4 +9,9 @@ enum { #define VETH_INFO_MAX (__VETH_INFO_MAX - 1) }; +#ifdef __KERNEL__ +struct net_device *veth_get_peer(struct net_device *veth); +void veth_set_peer(struct net_device *veth, struct net_device *peer); +#endif + #endif