From patchwork Wed Mar 19 16:52:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 331793 X-Patchwork-Delegate: shemminger@vyatta.com 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 2AFCA2C00A1 for ; Thu, 20 Mar 2014 03:52:42 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934023AbaCSQwg (ORCPT ); Wed, 19 Mar 2014 12:52:36 -0400 Received: from 33.106-14-84.ripe.coltfrance.com ([84.14.106.33]:56168 "EHLO proxy.6wind.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932602AbaCSQwe (ORCPT ); Wed, 19 Mar 2014 12:52:34 -0400 Received: from schnaps.dev.6wind.com (unknown [10.16.0.249]) by proxy.6wind.com (Postfix) with ESMTPS id 22FCF5B25B; Wed, 19 Mar 2014 17:52:13 +0100 (CET) Received: from root by schnaps.dev.6wind.com with local (Exim 4.80) (envelope-from ) id 1WQJiu-0002be-3U; Wed, 19 Mar 2014 17:52:12 +0100 From: Nicolas Dichtel To: shemminger@vyatta.com Cc: netdev@vger.kernel.org, Nicolas Dichtel Subject: [PATCH v2 iproute2 -next 1/2] include/linux: update xfrm.h Date: Wed, 19 Mar 2014 17:52:07 +0100 Message-Id: <1395247928-9954-1-git-send-email-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 1.8.5.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Nicolas Dichtel --- Note that this patch is based on net-next. include/linux/xfrm.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h index 341c3c951dac..fa2ecb2eb998 100644 --- a/include/linux/xfrm.h +++ b/include/linux/xfrm.h @@ -298,6 +298,8 @@ enum xfrm_attr_type_t { XFRMA_TFCPAD, /* __u32 */ XFRMA_REPLAY_ESN_VAL, /* struct xfrm_replay_esn */ XFRMA_SA_EXTRA_FLAGS, /* __u32 */ + XFRMA_PROTO, /* __u8 */ + XFRMA_ADDRESS_FILTER, /* struct xfrm_address_filter */ __XFRMA_MAX #define XFRMA_MAX (__XFRMA_MAX - 1) @@ -474,6 +476,14 @@ struct xfrm_user_mapping { __be16 new_sport; }; +struct xfrm_address_filter { + xfrm_address_t saddr; + xfrm_address_t daddr; + __u16 family; + __u8 splen; + __u8 dplen; +}; + /* backwards compatibility for userspace */ #define XFRMGRP_ACQUIRE 1 #define XFRMGRP_EXPIRE 2