From patchwork Sun Jul 23 01:34:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 792513 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="KeOp3/8K"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xFRsr4ZlRz9sR9 for ; Sun, 23 Jul 2017 11:36:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755305AbdGWBf6 (ORCPT ); Sat, 22 Jul 2017 21:35:58 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35461 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755288AbdGWBf5 (ORCPT ); Sat, 22 Jul 2017 21:35:57 -0400 Received: by mail-pf0-f196.google.com with SMTP id q85so7661297pfq.2; Sat, 22 Jul 2017 18:35:56 -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=ltfPXZAYFicRqOTUDJI4/MtcxT5zuLT4MtaU+ln14OU=; b=KeOp3/8K5SfkG8BnGs+j4UbUFUxsof6MfMf+rB1O6fFvW7532a25Q319eitV+OeZ5M wIEBSM7kUqfdvuAhxPf/QuGlLoJh9nklAg2bhv6lBMjAAONXvLYi8fDAR5sxOuq0iBtu gqfUTJDS9UQ/YMKBgeBiVf7KfaNHX1Ol68qOByMGo/Ugzmx5JuZb2ckbiUwlsqJc2cny 9YoNATGK23XzBghXOgATQcSDieZIHDay8qNaDdmU1cEVOHM94C6Bc/sv/+OBS+7ZzriZ 713J2MdqCjPqURtgbLvYAaTpsoJ9otsZNdsbjdwJcEzJf25ztueWaCk/9Spg+88MAV8e THig== 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=ltfPXZAYFicRqOTUDJI4/MtcxT5zuLT4MtaU+ln14OU=; b=HuA7FQWyTj97IKWctaYmfZa8S2xjuQ1L33Lb+ao53jZypiG6lXl84NN5/hoybBXdIB jMW7y0Lt3GqZ3QLOJLERF+fvujxwvUNh2mnhNUWNjg4RU06Mr7HvjRcvKSQeUuLxbR01 IPKG3KRl6u1Rdh4Y2WHE4QV8egRA2CaAA0tQ6L8FEFUKyZ5ttZcT87TyYHef6/a0YfE/ 6TfqUH0sdrkfqkihBFnImHAy0aeJNCfyBSb/aMkPF6ERn9Lb8cg1jOswr2gOQqCFRUpt 8V7TZjIim9esSErpZE07xk6DxeMdTCttibb9c0zuTT+g/FchiYK2pXjHKnZRHwErMHoX kbmQ== X-Gm-Message-State: AIVw110xydzMm9x5EgAeDbZChuxyY7qoXFrb955GPEabOVdqdn5yJF7y PMWqzYb51NlDmwS/EuE= X-Received: by 10.99.96.73 with SMTP id u70mr12025910pgb.345.1500773756431; Sat, 22 Jul 2017 18:35:56 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id p62sm40655pfg.66.2017.07.22.18.35.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Jul 2017 18:35:55 -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 09/11] sctp: remove the typedef sctp_heartbeathdr_t Date: Sun, 23 Jul 2017 09:34:34 +0800 Message-Id: <5de5ee9134309f0111da5edd768faf7aaff1c9fc.1500773578.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: 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> 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_heartbeathdr_t, and replace with struct sctp_heartbeathdr in the places where it's using this typedef. Signed-off-by: Xin Long --- include/linux/sctp.h | 6 +++--- net/sctp/sm_statefuns.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/linux/sctp.h b/include/linux/sctp.h index 48f6560..6e26b86 100644 --- a/include/linux/sctp.h +++ b/include/linux/sctp.h @@ -394,13 +394,13 @@ struct sctp_sack_chunk { * the present association. */ -typedef struct sctp_heartbeathdr { +struct sctp_heartbeathdr { struct sctp_paramhdr info; -} sctp_heartbeathdr_t; +}; typedef struct sctp_heartbeat_chunk { struct sctp_chunkhdr chunk_hdr; - sctp_heartbeathdr_t hb_hdr; + struct sctp_heartbeathdr hb_hdr; } sctp_heartbeat_chunk_t; diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 08ebe8c..32ac90b 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c @@ -1096,7 +1096,7 @@ sctp_disposition_t sctp_sf_beat_8_3(struct net *net, * respond with a HEARTBEAT ACK that contains the Heartbeat * Information field copied from the received HEARTBEAT chunk. */ - chunk->subh.hb_hdr = (sctp_heartbeathdr_t *)chunk->skb->data; + chunk->subh.hb_hdr = (struct sctp_heartbeathdr *)chunk->skb->data; param_hdr = (struct sctp_paramhdr *)chunk->subh.hb_hdr; paylen = ntohs(chunk->chunk_hdr->length) - sizeof(struct sctp_chunkhdr);