From patchwork Fri Aug 1 13:01:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Gouault X-Patchwork-Id: 375751 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 28B6A140116 for ; Fri, 1 Aug 2014 23:01:58 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755315AbaHANBy (ORCPT ); Fri, 1 Aug 2014 09:01:54 -0400 Received: from mail-we0-f172.google.com ([74.125.82.172]:48517 "EHLO mail-we0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755280AbaHANBx (ORCPT ); Fri, 1 Aug 2014 09:01:53 -0400 Received: by mail-we0-f172.google.com with SMTP id x48so4279851wes.17 for ; Fri, 01 Aug 2014 06:01:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GAEEG19Tpe2U2jf8LysdOmYQY6zXGJ3CAifLgbFKlLU=; b=UGGjvJSaazPMBq3MlgBFLzJjpiBZLRHIkstV+aB+vNPbTNmxymIP1WLEcpZD6N443m 4zy2tSa14ALD+7O8ieCMrASkfdQsbHj8Q2JwQc7pSC2xsSLKgHAZGCTv+awTfIgdxxey 0PKzmoSrRtEoKQLWAK5Oe7ZwoVqMtcL8Hs+F5muCARtXVQcBbX/e2BJzshwaklx105+Z rAPPls7OuLcFw2opT1c4axpY2Lc8t56P2TNE3g+dfc5M9yDwdtQjW++D5Gj2bCUm7gUb /zT/k59CK0GnKjpzZiICmKwm16kDMKZW5X9h/PjmVhXiAN1rWxv6Kt4RW1nIkf57MKfa QqVA== X-Gm-Message-State: ALoCoQnJxZDmKHNwkEQ/0yJHZeBLDO2AAKOti9cWWSUz3v9kZ67HhXi765mF+wa+jCK9G4JkXY8p X-Received: by 10.180.37.70 with SMTP id w6mr6439965wij.49.1406898111770; Fri, 01 Aug 2014 06:01:51 -0700 (PDT) Received: from ubuntu-1404.vm.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by mx.google.com with ESMTPSA id eh7sm18750561wjd.32.2014.08.01.06.01.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Aug 2014 06:01:51 -0700 (PDT) From: Christophe Gouault To: "David S. Miller" , Steffen Klassert Cc: netdev@vger.kernel.org, Christophe Gouault Subject: [PATCH RFC iproute2 1/2] Update headers to net-next Date: Fri, 1 Aug 2014 15:01:09 +0200 Message-Id: <1406898070-15942-2-git-send-email-christophe.gouault@6wind.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1406898070-15942-1-git-send-email-christophe.gouault@6wind.com> References: <1406884348-12423-3-git-send-email-christophe.gouault@6wind.com> <1406898070-15942-1-git-send-email-christophe.gouault@6wind.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org --- include/linux/xfrm.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h index fa2ecb2..3a1fd32 100644 --- a/include/linux/xfrm.h +++ b/include/linux/xfrm.h @@ -328,6 +328,8 @@ enum xfrm_spdattr_type_t { XFRMA_SPD_UNSPEC, XFRMA_SPD_INFO, XFRMA_SPD_HINFO, + XFRMA_SPD_IPV4_HTHRESH, + XFRMA_SPD_IPV6_HTHRESH, __XFRMA_SPD_MAX #define XFRMA_SPD_MAX (__XFRMA_SPD_MAX - 1) @@ -347,6 +349,11 @@ struct xfrmu_spdhinfo { __u32 spdhmcnt; }; +struct xfrmu_spdhthresh { + __u8 lbits; + __u8 rbits; +}; + struct xfrm_usersa_info { struct xfrm_selector sel; struct xfrm_id id;