diff mbox

[PATCHv2,net-next,1/5] {pktgen, xfrm} Remove original pktgen ipsec fixed configuration

Message ID 1386323614-5077-2-git-send-email-fan.du@windriver.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

fan.du Dec. 6, 2013, 9:53 a.m. UTC 
Cleanup original fixed IPsec output mode and encapuslation type,
As following patchset enable user to configure IPsec attribute.

Signed-off-by: Fan Du <fan.du@windriver.com>
---
 net/core/pktgen.c |    8 --------
 1 file changed, 8 deletions(-)
diff mbox

Patch

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);