From patchwork Fri Jun 30 03:52:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 782654 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 3wzN1f467qz9sNV for ; Fri, 30 Jun 2017 13:53:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bWbjJ0kZ"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752172AbdF3Dx4 (ORCPT ); Thu, 29 Jun 2017 23:53:56 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34687 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752150AbdF3Dxz (ORCPT ); Thu, 29 Jun 2017 23:53:55 -0400 Received: by mail-pf0-f194.google.com with SMTP id c24so861053pfe.1; Thu, 29 Jun 2017 20:53:54 -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=GQZ0SqaBwoeyhyoNKQ94WQEjRZFP1KtDlV0EkJVXvao=; b=bWbjJ0kZpdGvGsF39ODnZ6Dgk2MvfojBQq2EWKcSAlSgeWLQt3CIpX7AmuSaBLE+Hq 8fkXdR/Dj7JeHCwPOfm2oIIE8+7TLKAmdPWuJE7+QbQ2pF5vHMoq7W4sXWz3qsVQCD9S /x75IT+CjiZqBnMiBwngvcFeyU2j8MRFhu1xza4d82DG7O7hCY4ISKGyTjD6Xx/CIDDb GnelVm/6h4KQf25BYpYM/8r7o9YPU3X0daZA7/MO7nxlB/c8WYPvDHmhAmyvASnKGabL ZPN5WWT4lf0A+fVTg30RbgoY7e41rkJIYZKr5p8WbnUGrUF9WXT37Fo/1aCfuQbwRN8i 3Vsw== 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=GQZ0SqaBwoeyhyoNKQ94WQEjRZFP1KtDlV0EkJVXvao=; b=szMIyz/Y5+XVXlEgGV4foYBGGjJzuylkN9CF+iJveOV7GYrw98IdDkfgp+wL0sqjux 2aRgyFjfWjGEY8IGLavTXc0HFnH5SDoDu4GtHitdPXV8DN83+pdCvwLJPdPq1Ril9m7w ivaIt9P/58ViQ/PjpRDz/88YpYP056830jyjHc7fPibdTntL6pWzQQdJOrr8SRX2jNDW +2lWt9/HevcnYbHrnpZ6CYOUnp2NA37BB5X8IGexIRHiZkPwsoQGGja2CKgJmr98zb7/ BWqvGkspTr3J1vurA2x6u7ZTjrDVBV09Lr2owhUO5b9zNeUztsVXy+o49AULK7ivxC8p ZMTQ== X-Gm-Message-State: AKS2vOzhWwJoRZXcTwMjk3mgqabU1fnyeYwq5hYzAcszxHZLAtF20NXh aJ/2QfNKcoaRN9SxGG4= X-Received: by 10.98.201.25 with SMTP id k25mr20100104pfg.206.1498794829209; Thu, 29 Jun 2017 20:53:49 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id u9sm15609056pfg.127.2017.06.29.20.53.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Jun 2017 20:53:48 -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 08/11] sctp: remove the typedef sctp_datahdr_t Date: Fri, 30 Jun 2017 11:52:19 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: <81c68360c17817528e46216d9d48168b35e44434.1498794482.git.lucien.xin@gmail.com> References: <9b26ac600c9c3f9426b370ecd69261c25d220b2b.1498794482.git.lucien.xin@gmail.com> <2ae031641ce87e8fa77af7d3ea31b163f6c25f3d.1498794482.git.lucien.xin@gmail.com> <794094c6a1a0fdbf5374c983b2558e1316a51fd4.1498794482.git.lucien.xin@gmail.com> <81c68360c17817528e46216d9d48168b35e44434.1498794482.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_datahdr_t, and replace with struct sctp_datahdr in the places where it's using this typedef. It is also to use izeof(variable) instead of sizeof(type). Signed-off-by: Xin Long --- include/linux/sctp.h | 6 +++--- net/sctp/sm_statefuns.c | 13 ++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/linux/sctp.h b/include/linux/sctp.h index d5c0dda..55d84c1 100644 --- a/include/linux/sctp.h +++ b/include/linux/sctp.h @@ -227,17 +227,17 @@ enum { SCTP_PARAM_ACTION_MASK = cpu_to_be16(0xc000), }; /* RFC 2960 Section 3.3.1 Payload Data (DATA) (0) */ -typedef struct sctp_datahdr { +struct sctp_datahdr { __be32 tsn; __be16 stream; __be16 ssn; __be32 ppid; __u8 payload[0]; -} sctp_datahdr_t; +}; typedef struct sctp_data_chunk { struct sctp_chunkhdr chunk_hdr; - sctp_datahdr_t data_hdr; + struct sctp_datahdr data_hdr; } sctp_data_chunk_t; /* DATA Chuck Specific Flags */ diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 0a01c68..1ba9a9b 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c @@ -3010,7 +3010,8 @@ sctp_disposition_t sctp_sf_eat_data_6_2(struct net *net, return SCTP_DISPOSITION_ABORT; case SCTP_IERROR_PROTO_VIOLATION: return sctp_sf_abort_violation(net, ep, asoc, chunk, commands, - (u8 *)chunk->subh.data_hdr, sizeof(sctp_datahdr_t)); + (u8 *)chunk->subh.data_hdr, + sizeof(struct sctp_datahdr)); default: BUG(); } @@ -3124,7 +3125,8 @@ sctp_disposition_t sctp_sf_eat_data_fast_4_4(struct net *net, return SCTP_DISPOSITION_ABORT; case SCTP_IERROR_PROTO_VIOLATION: return sctp_sf_abort_violation(net, ep, asoc, chunk, commands, - (u8 *)chunk->subh.data_hdr, sizeof(sctp_datahdr_t)); + (u8 *)chunk->subh.data_hdr, + sizeof(struct sctp_datahdr)); default: BUG(); } @@ -6197,7 +6199,7 @@ static int sctp_eat_data(const struct sctp_association *asoc, struct sctp_chunk *chunk, sctp_cmd_seq_t *commands) { - sctp_datahdr_t *data_hdr; + struct sctp_datahdr *data_hdr; struct sctp_chunk *err; size_t datalen; sctp_verb_t deliver; @@ -6210,8 +6212,9 @@ static int sctp_eat_data(const struct sctp_association *asoc, u16 sid; u8 ordered = 0; - data_hdr = chunk->subh.data_hdr = (sctp_datahdr_t *)chunk->skb->data; - skb_pull(chunk->skb, sizeof(sctp_datahdr_t)); + data_hdr = (struct sctp_datahdr *)chunk->skb->data; + chunk->subh.data_hdr = data_hdr; + skb_pull(chunk->skb, sizeof(*data_hdr)); tsn = ntohl(data_hdr->tsn); pr_debug("%s: TSN 0x%x\n", __func__, tsn);