From patchwork Tue Dec 18 10:56:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?WU9TSElGVUpJIEhpZGVha2kgLyDlkInol6Toi7HmmI4=?= X-Patchwork-Id: 207071 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 293702C007E for ; Tue, 18 Dec 2012 21:56:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754721Ab2LRK4a (ORCPT ); Tue, 18 Dec 2012 05:56:30 -0500 Received: from 94.43.138.210.xn.2iij.net ([210.138.43.94]:56648 "EHLO mail.st-paulia.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754524Ab2LRK4a (ORCPT ); Tue, 18 Dec 2012 05:56:30 -0500 Received: from [192.168.2.160] (unknown [192.168.2.160]) by mail.st-paulia.net (Postfix) with ESMTPSA id 1A6E01BDEA; Tue, 18 Dec 2012 19:56:29 +0900 (JST) Message-ID: <50D04BDD.3070203@linux-ipv6.org> Date: Tue, 18 Dec 2012 19:56:29 +0900 From: YOSHIFUJI Hideaki Organization: USAGI Project User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: davem@davemloft.net, netdev@vger.kernel.org CC: yoshfuji@linux-ipv6.org Subject: [GIT PULL net-next 17/17] ndisc: Use return value of __skb_put(), instead of icmp6_hdr(). References: <50CF84A5.7030706@linux-ipv6.org> In-Reply-To: <50CF84A5.7030706@linux-ipv6.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It is safe to use __skb_put() here and it returns buffer for ICMPv6 header. Let's use it. Signed-off-by: YOSHIFUJI Hideaki --- net/ipv6/ndisc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index e614388..232daea 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -1469,8 +1469,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target) if (!buff) goto release; - skb_put(buff, sizeof(struct red_msg)); - msg = (struct red_msg *)icmp6_hdr(buff); + msg = (struct red_msg *)__skb_put(buff, sizeof(struct red_msg)); *msg = (struct red_msg) { .icmph = { .icmp6_type = NDISC_REDIRECT,