From patchwork Sun Jul 23 01:34:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 792514 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="E23aGg9r"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xFRt072Ftz9sPs for ; Sun, 23 Jul 2017 11:36:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755314AbdGWBgG (ORCPT ); Sat, 22 Jul 2017 21:36:06 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:34050 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755288AbdGWBgF (ORCPT ); Sat, 22 Jul 2017 21:36:05 -0400 Received: by mail-pf0-f196.google.com with SMTP id o88so7670379pfk.1; Sat, 22 Jul 2017 18:36:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=ol+LCCtih4Xp/TkKkKdF/PGBwc5l1hsoabToxG2m7lE=; b=E23aGg9rrtBe9YbfwiYfGguo3L3PRaLi7gkJP6cluqEuHfhtQCHJy8jgDFrh6SvToC hbtos19peiJAEatN0Y9M5/+iZNUIJt+s6YdRHYJF72txEuxLEQH9+eL8D6OehjvbAV/9 pSRJSt498AZLoD4NuWJPLLkQIiE13M9f2BsbsygA8Eu8uJn5+2Fvgx/VkB5tnsymfVuF y2DDQzFgAB34DpdoN0I36W3TW5Fr3K8TU9Phczp8bdcEUry/jllMBsw4qZOjqbFcQcyc CEEAS2ckMtq8wmp5Oz7F/Hrj2cVsN+zwymMw9lnrKFI67VE3JwB73ER/wYIA1UIshvuf 56Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=ol+LCCtih4Xp/TkKkKdF/PGBwc5l1hsoabToxG2m7lE=; b=JWJ/3hRJzUKSYlqQV1pIdUideWalt8VavRaRd+w2P+FIwF7/J9Nnt0faNjPFRaSJaC p3LBJErWkNo/4YjKD3iSD9jLOgFMLxkZ2DUob+Lw7iPP67IDZNC3MNwMJThLkslptoyp zCo7pvtsNHW6SJh75xJQ/Zo89UxwnbbwS6O01EunMhSSkSA7Q8radV3t6kQeZsE1mnnR 2xaJgSagkvX/8qzZoSATdoWeJMJfhfpN6yIOo6A1QegYsm46oyZ7c8UCYkpcWoheFI7d 41p4sdKa6KqQPmF8pSUPvaTkCKlw4TxZi0V8SfICt6wpRnUnEZecZU7tXBc8N0iVdYGL jr0Q== X-Gm-Message-State: AIVw113P5JxkF2+cSHrHhFBxem7BxEEJDOfg+V1wAwFo687/YqzY534l revYiVqrPazqwAwjhe4= X-Received: by 10.101.73.197 with SMTP id t5mr11866059pgs.160.1500773764579; Sat, 22 Jul 2017 18:36:04 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id l17sm15987646pfk.146.2017.07.22.18.36.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Jul 2017 18:36:04 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: Marcelo Ricardo Leitner , Neil Horman , davem@davemloft.net Subject: [PATCH net-next 10/11] sctp: remove the typedef sctp_heartbeat_chunk_t Date: Sun, 23 Jul 2017 09:34:35 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: <5de5ee9134309f0111da5edd768faf7aaff1c9fc.1500773578.git.lucien.xin@gmail.com> References: <78a33af4a9d7ef7116637943dbd0ae1403d20114.1500773578.git.lucien.xin@gmail.com> <54eca4d5d79aae83b386754b4613edc388521d54.1500773578.git.lucien.xin@gmail.com> <303fa591073b161b9434fa7f81a8d9d119954359.1500773578.git.lucien.xin@gmail.com> <42fb936def0c9ef0522d2e3809c9c07dccb6974f.1500773578.git.lucien.xin@gmail.com> <94b6f03745317ab5c57639f2155a5e1503b4dfb3.1500773578.git.lucien.xin@gmail.com> <734295f5625300a5328c19e255dfbbf7d393e48f.1500773578.git.lucien.xin@gmail.com> <5de5ee9134309f0111da5edd768faf7aaff1c9fc.1500773578.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch is to remove the typedef sctp_heartbeat_chunk_t, and replace with struct sctp_heartbeat_chunk in the places where it's using this typedef. Signed-off-by: Xin Long --- include/linux/sctp.h | 4 ++-- net/sctp/sm_statefuns.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/linux/sctp.h b/include/linux/sctp.h index 6e26b86..bfda7c6 100644 --- a/include/linux/sctp.h +++ b/include/linux/sctp.h @@ -398,10 +398,10 @@ struct sctp_heartbeathdr { struct sctp_paramhdr info; }; -typedef struct sctp_heartbeat_chunk { +struct sctp_heartbeat_chunk { struct sctp_chunkhdr chunk_hdr; struct sctp_heartbeathdr hb_hdr; -} sctp_heartbeat_chunk_t; +}; /* For the abort and shutdown ACK we must carry the init tag in the diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 32ac90b..7bbee08 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c @@ -1088,7 +1088,8 @@ sctp_disposition_t sctp_sf_beat_8_3(struct net *net, return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands); /* Make sure that the HEARTBEAT chunk has a valid length. */ - if (!sctp_chunk_length_valid(chunk, sizeof(sctp_heartbeat_chunk_t))) + if (!sctp_chunk_length_valid(chunk, + sizeof(struct sctp_heartbeat_chunk))) return sctp_sf_violation_chunklen(net, ep, asoc, type, arg, commands);