From patchwork Wed Jun 26 21:56:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Krause X-Patchwork-Id: 254882 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 AD9C32C03F5 for ; Thu, 27 Jun 2013 07:57:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752707Ab3FZV5P (ORCPT ); Wed, 26 Jun 2013 17:57:15 -0400 Received: from mail-bk0-f41.google.com ([209.85.214.41]:40575 "EHLO mail-bk0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752625Ab3FZV5N (ORCPT ); Wed, 26 Jun 2013 17:57:13 -0400 Received: by mail-bk0-f41.google.com with SMTP id jc3so5237454bkc.28 for ; Wed, 26 Jun 2013 14:57:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=uI4KbAG6gOQJZww8z6wTQWJ86Dvng6EaO+aA93R3OHE=; b=kmZ3cI08EuyL8/7mPdli53WCi9BtE9Oqzr5DPm4bN2fJmw3gKPO9JJnBqrg5mmqwly 4J9JQPwICTtQxo4d2qL80NVWwORXhoO3m4yfXdWft7D7QRwYEWW13AA4bEWjVefkinQB OA0JMr2imLAxvhhBSZTLscLiEg+ejusgc3nyqvHrzH39qpSvuIDj3/Z8kW/kE/ECo8uS WsWxe6Kv7WsFbfmsGCzgo+IefOord0uirDWOZs/3GODaIpbaJyJtID2LZqJARr4RHCWP Pj5seQM1/6gkM1+EC1a4BeBodes5OqGYYzhkaVjX0Fw4mQb4r7O6fKfKwGo6eciBBoc2 bVrA== X-Received: by 10.204.235.69 with SMTP id kf5mr533473bkb.86.1372283831890; Wed, 26 Jun 2013 14:57:11 -0700 (PDT) Received: from jig.fritz.box (pD9EB15FE.dip0.t-ipconnect.de. [217.235.21.254]) by mx.google.com with ESMTPSA id ps10sm4674384bkb.14.2013.06.26.14.57.11 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Jun 2013 14:57:11 -0700 (PDT) From: Mathias Krause To: Steffen Klassert Cc: Mathias Krause , netdev@vger.kernel.org, "David S. Miller" , Herbert Xu Subject: [PATCH 2/2] af_key: constify lookup tables Date: Wed, 26 Jun 2013 23:56:59 +0200 Message-Id: <1372283819-30012-3-git-send-email-minipli@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1372283819-30012-1-git-send-email-minipli@googlemail.com> References: <1372283819-30012-1-git-send-email-minipli@googlemail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The lookup tables for minimum sizes of extensions and for the pfkey handler functions are read only, therefore can be const. Signed-off-by: Mathias Krause Cc: "David S. Miller" Cc: Herbert Xu --- net/key/af_key.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/key/af_key.c b/net/key/af_key.c index 5490d97..8432eb1 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -338,7 +338,7 @@ static int pfkey_error(const struct sadb_msg *orig, int err, struct sock *sk) return 0; } -static u8 sadb_ext_min_len[] = { +static const u8 sadb_ext_min_len[] = { [SADB_EXT_RESERVED] = (u8) 0, [SADB_EXT_SA] = (u8) sizeof(struct sadb_sa), [SADB_EXT_LIFETIME_CURRENT] = (u8) sizeof(struct sadb_lifetime), @@ -2734,7 +2734,7 @@ static int pfkey_spdflush(struct sock *sk, struct sk_buff *skb, const struct sad typedef int (*pfkey_handler)(struct sock *sk, struct sk_buff *skb, const struct sadb_msg *hdr, void * const *ext_hdrs); -static pfkey_handler pfkey_funcs[SADB_MAX + 1] = { +static const pfkey_handler pfkey_funcs[SADB_MAX + 1] = { [SADB_RESERVED] = pfkey_reserved, [SADB_GETSPI] = pfkey_getspi, [SADB_UPDATE] = pfkey_add,