From patchwork Fri Jan 18 02:39:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 213445 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 76BC82C0087 for ; Fri, 18 Jan 2013 13:35:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753350Ab3ARCfk (ORCPT ); Thu, 17 Jan 2013 21:35:40 -0500 Received: from smtp.gentoo.org ([140.211.166.183]:40111 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752020Ab3ARCfj (ORCPT ); Thu, 17 Jan 2013 21:35:39 -0500 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 9F7A033D876; Fri, 18 Jan 2013 02:35:32 +0000 (UTC) From: Mike Frysinger To: stephen.hemminger@vyatta.com, netdev@vger.kernel.org Subject: [PATCH] [iproute] ipxfrm: simplify algo code a bit Date: Thu, 17 Jan 2013 21:39:06 -0500 Message-Id: <1358476746-10810-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.8.0.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The current code sets up a structure with xfrm_algo embedded in it, but doesn't use the supplemental key field. Drop it. Signed-off-by: Mike Frysinger --- note: i don't have a system where this code runs (probably missing options in my kernel). i checked xfrm_aead_print a bit but couldn't quite figure it out. it doesn't seem like it needs that trailing space. ip/ipxfrm.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/ip/ipxfrm.c b/ip/ipxfrm.c index c7b3420..bd313e6 100644 --- a/ip/ipxfrm.c +++ b/ip/ipxfrm.c @@ -555,16 +555,13 @@ static inline void xfrm_algo_print(struct xfrm_algo *algo, int type, int len, static void xfrm_aead_print(struct xfrm_algo_aead *algo, int len, FILE *fp, const char *prefix) { - struct { - struct xfrm_algo algo; - char key[algo->alg_key_len / 8]; - } base; + struct xfrm_algo base_algo; - memcpy(base.algo.alg_name, algo->alg_name, sizeof(base.algo.alg_name)); - base.algo.alg_key_len = algo->alg_key_len; - memcpy(base.algo.alg_key, algo->alg_key, algo->alg_key_len / 8); + memcpy(base_algo.alg_name, algo->alg_name, sizeof(base_algo.alg_name)); + base_algo.alg_key_len = algo->alg_key_len; + memcpy(base_algo.alg_key, algo->alg_key, algo->alg_key_len / 8); - __xfrm_algo_print(&base.algo, XFRMA_ALG_AEAD, len, fp, prefix, 0); + __xfrm_algo_print(&base_algo, XFRMA_ALG_AEAD, len, fp, prefix, 0); fprintf(fp, " %d", algo->alg_icv_len); @@ -574,16 +571,13 @@ static void xfrm_aead_print(struct xfrm_algo_aead *algo, int len, static void xfrm_auth_trunc_print(struct xfrm_algo_auth *algo, int len, FILE *fp, const char *prefix) { - struct { - struct xfrm_algo algo; - char key[algo->alg_key_len / 8]; - } base; + struct xfrm_algo base_algo; - memcpy(base.algo.alg_name, algo->alg_name, sizeof(base.algo.alg_name)); - base.algo.alg_key_len = algo->alg_key_len; - memcpy(base.algo.alg_key, algo->alg_key, algo->alg_key_len / 8); + memcpy(base_algo.alg_name, algo->alg_name, sizeof(base_algo.alg_name)); + base_algo.alg_key_len = algo->alg_key_len; + memcpy(base_algo.alg_key, algo->alg_key, algo->alg_key_len / 8); - __xfrm_algo_print(&base.algo, XFRMA_ALG_AUTH_TRUNC, len, fp, prefix, 0); + __xfrm_algo_print(&base_algo, XFRMA_ALG_AUTH_TRUNC, len, fp, prefix, 0); fprintf(fp, " %d", algo->alg_trunc_len);