From patchwork Fri Dec 6 09:53:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "fan.du" X-Patchwork-Id: 297656 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 A41D52C00A1 for ; Fri, 6 Dec 2013 20:53:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757226Ab3LFJxl (ORCPT ); Fri, 6 Dec 2013 04:53:41 -0500 Received: from mail.windriver.com ([147.11.1.11]:50700 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756786Ab3LFJxi (ORCPT ); Fri, 6 Dec 2013 04:53:38 -0500 Received: from ALA-HCB.corp.ad.wrs.com (ala-hcb.corp.ad.wrs.com [147.11.189.41]) by mail.windriver.com (8.14.5/8.14.5) with ESMTP id rB69rYE0002853 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Fri, 6 Dec 2013 01:53:34 -0800 (PST) Received: from iamroot-OptiPlex-780.corp.ad.wrs.com (128.224.162.238) by ALA-HCB.corp.ad.wrs.com (147.11.189.41) with Microsoft SMTP Server id 14.2.347.0; Fri, 6 Dec 2013 01:53:34 -0800 From: Fan Du To: , CC: Subject: [PATCHv2 net-next 1/5] {pktgen, xfrm} Remove original pktgen ipsec fixed configuration Date: Fri, 6 Dec 2013 17:53:30 +0800 Message-ID: <1386323614-5077-2-git-send-email-fan.du@windriver.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1386323614-5077-1-git-send-email-fan.du@windriver.com> References: <1386323614-5077-1-git-send-email-fan.du@windriver.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Cleanup original fixed IPsec output mode and encapuslation type, As following patchset enable user to configure IPsec attribute. Signed-off-by: Fan Du --- net/core/pktgen.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index a797fff..e6820e5 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -387,8 +387,6 @@ struct pktgen_dev { int node; /* Memory node */ #ifdef CONFIG_XFRM - __u8 ipsmode; /* IPSEC mode (config) */ - __u8 ipsproto; /* IPSEC type (config) */ #endif char result[512]; }; @@ -2482,10 +2480,6 @@ static int pktgen_output_ipsec(struct sk_buff *skb, struct pktgen_dev *pkt_dev) if (!x) return 0; - /* XXX: we dont support tunnel mode for now until - * we resolve the dst issue */ - if (x->props.mode != XFRM_MODE_TRANSPORT) - return 0; spin_lock(&x->lock); @@ -3540,8 +3534,6 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname) goto out2; } #ifdef CONFIG_XFRM - pkt_dev->ipsmode = XFRM_MODE_TRANSPORT; - pkt_dev->ipsproto = IPPROTO_ESP; #endif return add_dev_to_thread(t, pkt_dev);