From patchwork Fri Mar 13 18:52:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Eric W. Biederman" X-Patchwork-Id: 450049 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 C297D14007D for ; Sat, 14 Mar 2015 05:56:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754562AbbCMS42 (ORCPT ); Fri, 13 Mar 2015 14:56:28 -0400 Received: from out01.mta.xmission.com ([166.70.13.231]:41965 "EHLO out01.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753489AbbCMS41 (ORCPT ); Fri, 13 Mar 2015 14:56:27 -0400 Received: from in01.mta.xmission.com ([166.70.13.51]) by out01.mta.xmission.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1YWUl0-0001S1-Qn; Fri, 13 Mar 2015 12:56:26 -0600 Received: from 70-59-163-10.omah.qwest.net ([70.59.163.10] helo=x220.int.ebiederm.org.xmission.com) by in01.mta.xmission.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1YWUl0-00042L-9Z; Fri, 13 Mar 2015 12:56:26 -0600 From: ebiederm@xmission.com (Eric W. Biederman) To: Stephen Hemminger Cc: References: <87bnjwspek.fsf@x220.int.ebiederm.org> Date: Fri, 13 Mar 2015 13:52:45 -0500 In-Reply-To: <87bnjwspek.fsf@x220.int.ebiederm.org> (Eric W. Biederman's message of "Fri, 13 Mar 2015 13:50:11 -0500") Message-ID: <87wq2krapu.fsf@x220.int.ebiederm.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-XM-AID: U2FsdGVkX1/LEY8IVlb8+jS0/icl3z0rr9k8j8r3IW4= X-SA-Exim-Connect-IP: 70.59.163.10 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on sa07.xmission.com X-Spam-Level: X-Spam-Status: No, score=0.5 required=8.0 tests=ALL_TRUSTED,BAYES_50, DCC_CHECK_NEGATIVE, TVD_RCVD_IP, T_TooManySym_01, T_TooManySym_02, XMSubLong autolearn=disabled version=3.4.0 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.0 TVD_RCVD_IP Message was received from an IP address * 0.7 XMSubLong Long Subject * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.4875] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa07 1397; Body=1 Fuz1=1 Fuz2=1] * 0.0 T_TooManySym_01 4+ unique symbols in subject * 0.0 T_TooManySym_02 5+ unique symbols in subject X-Spam-DCC: XMission; sa07 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ;Stephen Hemminger X-Spam-Relay-Country: X-Spam-Timing: total 241 ms - load_scoreonly_sql: 0.04 (0.0%), signal_user_changed: 3.2 (1.3%), b_tie_ro: 2.3 (1.0%), parse: 0.66 (0.3%), extract_message_metadata: 11 (4.4%), get_uri_detail_list: 0.86 (0.4%), tests_pri_-1000: 5 (2.2%), tests_pri_-950: 1.26 (0.5%), tests_pri_-900: 1.04 (0.4%), tests_pri_-400: 14 (5.9%), check_bayes: 13 (5.4%), b_tokenize: 4.2 (1.8%), b_tok_get_all: 3.8 (1.6%), b_comp_prob: 1.27 (0.5%), b_tok_touch_all: 1.97 (0.8%), b_finish: 0.60 (0.2%), tests_pri_0: 197 (81.9%), tests_pri_500: 4.7 (1.9%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH net-next 2/8] iproute2: Make the addr argument of ll_addr_n2a const X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Wed, 24 Sep 2014 11:00:52 -0600) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This avoids build warnings when AF_PACKET support is added to rt_addr_n2a. Signed-off-by: "Eric W. Biederman" --- include/rt_names.h | 2 +- lib/ll_addr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/rt_names.h b/include/rt_names.h index c0ea4f982904..921be0607b51 100644 --- a/include/rt_names.h +++ b/include/rt_names.h @@ -22,7 +22,7 @@ int inet_proto_a2n(const char *buf); const char * ll_type_n2a(int type, char *buf, int len); -const char *ll_addr_n2a(unsigned char *addr, int alen, +const char *ll_addr_n2a(const unsigned char *addr, int alen, int type, char *buf, int blen); int ll_addr_a2n(char *lladdr, int len, const char *arg); diff --git a/lib/ll_addr.c b/lib/ll_addr.c index c12ab075c4a9..2ce9abfbb8c6 100644 --- a/lib/ll_addr.c +++ b/lib/ll_addr.c @@ -29,7 +29,7 @@ #include "utils.h" -const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int blen) +const char *ll_addr_n2a(const unsigned char *addr, int alen, int type, char *buf, int blen) { int i; int l;