From patchwork Tue Feb 20 13:28:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 875532 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="o1oJjs3A"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zm1fk1NZ8z9s01 for ; Wed, 21 Feb 2018 00:29:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751895AbeBTN2u (ORCPT ); Tue, 20 Feb 2018 08:28:50 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:39894 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751646AbeBTN2s (ORCPT ); Tue, 20 Feb 2018 08:28:48 -0500 Received: by mail-pg0-f66.google.com with SMTP id w17so7103344pgv.6; Tue, 20 Feb 2018 05:28:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=N8CEF3FPQoSe+fMf/4b2fFjdMfiQhn2cK9GhByiXLWg=; b=o1oJjs3A4FC7XOQOQ8Zip9Zags23M+wjjmyZQcPn6c8Vh7l/2A1ADLuXH3c6BUl30E E5b/KG8p0IOdqArUSR0FwNXVjOb9tmH4J0ogiRJPIOdyQJX9l4lwsVy5OL9CttEqjOzs dMqfE2gSj/CNgV1DshuCYhpwgUD9R1rHCEkU2hh35hvcCz59pTKINot+l/wbPGiBTeis zSQLBLdH5gD0oI8IkAfcoszqey1aFKKc9qGLx05Z44oL4n9dTh+v3MdwYmVveyhd8chP hKnz4SJYFAytYTcH1WEeHVV3XZVDvaQx1i9h5OrL+AVtKu2LzKWSDi741D8+wLxed1dj utbQ== 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; bh=N8CEF3FPQoSe+fMf/4b2fFjdMfiQhn2cK9GhByiXLWg=; b=smb7cWhovAN37KqHX245M8YIDDIzTE9juc5sXcvGKTIZS9Kgq06GkMbrmYNspGUH63 Uf3EFZNbBZN/o9k6o1BNt26aFsttu+Rxsg66M3BC27y5Zpx1crggQ8vWV3xwvd7RNPk2 llYGhuxxXXi2ZrO79dqq8eqCPgSqC5JjNfBQpoHz7RTlx3c2pEubP3jHN6DA0RfIEi1m fSlQXAVW+gJweZB2+V61ZBNPMXO4DQ8qblWeHm/tyz3SFGV8cGoER1o1NxxvzMrK9THC EqVTncV3Ost/UERaZhRiuBgvxLvldCtr4C08jMQGk0xZhQIO0j6fBhcT50XblTgThwUc zKrg== X-Gm-Message-State: APf1xPCVy53DxqM6nw38boL8v/UuecDSecFKM3MrITySOyy8VUcB+kXc 5f74nL1docvp5aWsITHSIPqF39pF X-Google-Smtp-Source: AH8x225UPQsmiwRccpebHDVOWRIdJJJ8GIXujr1oNAM70rOwuZV1upx9sCNfWMiw+1+KIEbDxqeOVA== X-Received: by 10.98.133.140 with SMTP id m12mr18032155pfk.226.1519133328461; Tue, 20 Feb 2018 05:28:48 -0800 (PST) Received: from li1588-6.members.linode.com (li1588-6.members.linode.com. [139.162.104.6]) by smtp.gmail.com with ESMTPSA id v1sm59624341pfg.33.2018.02.20.05.28.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Feb 2018 05:28:47 -0800 (PST) From: Yafang Shao To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yafang Shao Subject: [PATCH net-next] tcp: remove the hardcode in the definition of TCPF Macro Date: Tue, 20 Feb 2018 21:28:31 +0800 Message-Id: <1519133311-22068-1-git-send-email-laoar.shao@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org TCPF_ macro depends on the definition of TCP_ macro. So it is better to define them with TCP_ marco. Signed-off-by: Yafang Shao Reviewed-by: Eric Dumazet --- include/net/tcp_states.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) -- 1.8.3.1 diff --git a/include/net/tcp_states.h b/include/net/tcp_states.h index 50e78a7..2875e16 100644 --- a/include/net/tcp_states.h +++ b/include/net/tcp_states.h @@ -32,21 +32,21 @@ enum { #define TCP_STATE_MASK 0xF -#define TCP_ACTION_FIN (1 << 7) +#define TCP_ACTION_FIN (1 << TCP_CLOSE) enum { - TCPF_ESTABLISHED = (1 << 1), - TCPF_SYN_SENT = (1 << 2), - TCPF_SYN_RECV = (1 << 3), - TCPF_FIN_WAIT1 = (1 << 4), - TCPF_FIN_WAIT2 = (1 << 5), - TCPF_TIME_WAIT = (1 << 6), - TCPF_CLOSE = (1 << 7), - TCPF_CLOSE_WAIT = (1 << 8), - TCPF_LAST_ACK = (1 << 9), - TCPF_LISTEN = (1 << 10), - TCPF_CLOSING = (1 << 11), - TCPF_NEW_SYN_RECV = (1 << 12), + TCPF_ESTABLISHED = (1 << TCP_ESTABLISHED), + TCPF_SYN_SENT = (1 << TCP_SYN_SENT), + TCPF_SYN_RECV = (1 << TCP_SYN_RECV), + TCPF_FIN_WAIT1 = (1 << TCP_FIN_WAIT1), + TCPF_FIN_WAIT2 = (1 << TCP_FIN_WAIT2), + TCPF_TIME_WAIT = (1 << TCP_TIME_WAIT), + TCPF_CLOSE = (1 << TCP_CLOSE), + TCPF_CLOSE_WAIT = (1 << TCP_CLOSE_WAIT), + TCPF_LAST_ACK = (1 << TCP_LAST_ACK), + TCPF_LISTEN = (1 << TCP_LISTEN), + TCPF_CLOSING = (1 << TCP_CLOSING), + TCPF_NEW_SYN_RECV = (1 << TCP_NEW_SYN_RECV), }; #endif /* _LINUX_TCP_STATES_H */