From: Leon Romanovsky <leon@kernel.org>
To: Guangbin Huang <huangguangbin2@huawei.com>
Cc: davem@davemloft.net, kuba@kernel.org, edumazet@google.com,
pabeni@redhat.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, shenjian15@huawei.com,
lanhao@huawei.com
Subject: Re: [PATCH net-next 3/4] net: hns3: replace magic numbers with macro for IPv4/v6
Date: Wed, 28 Sep 2022 13:34:22 +0300 [thread overview]
Message-ID: <YzQjLu2jlEzm1lRo@unreal> (raw)
In-Reply-To: <20220927111205.18060-4-huangguangbin2@huawei.com>
On Tue, Sep 27, 2022 at 07:12:04PM +0800, Guangbin Huang wrote:
> From: Hao Chen <chenhao418@huawei.com>
>
> Replace 4/6 with IP_VERSION_V4/6 to improve code readability.
>
> Signed-off-by: Hao Chen <chenhao418@huawei.com>
> Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
> ---
> drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 12 ++++++------
> drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 3 +++
> 2 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
> index 39b75b68474c..bf573e0c0670 100644
> --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
> @@ -1180,7 +1180,7 @@ static int hns3_set_tso(struct sk_buff *skb, u32 *paylen_fdop_ol4cs,
> /* Software should clear the IPv4's checksum field when tso is
> * needed.
> */
> - if (l3.v4->version == 4)
> + if (l3.v4->version == IP_VERSION_IPV4)
> l3.v4->check = 0;
>
> /* tunnel packet */
> @@ -1195,7 +1195,7 @@ static int hns3_set_tso(struct sk_buff *skb, u32 *paylen_fdop_ol4cs,
> /* Software should clear the IPv4's checksum field when
> * tso is needed.
> */
> - if (l3.v4->version == 4)
> + if (l3.v4->version == IP_VERSION_IPV4)
> l3.v4->check = 0;
> }
>
> @@ -1270,13 +1270,13 @@ static int hns3_get_l4_protocol(struct sk_buff *skb, u8 *ol4_proto,
> l3.hdr = skb_inner_network_header(skb);
> l4_hdr = skb_inner_transport_header(skb);
>
> - if (l3.v6->version == 6) {
> + if (l3.v6->version == IP_VERSION_IPV6) {
> exthdr = l3.hdr + sizeof(*l3.v6);
> l4_proto_tmp = l3.v6->nexthdr;
> if (l4_hdr != exthdr)
> ipv6_skip_exthdr(skb, exthdr - skb->data,
> &l4_proto_tmp, &frag_off);
> - } else if (l3.v4->version == 4) {
> + } else if (l3.v4->version == IP_VERSION_IPV4) {
> l4_proto_tmp = l3.v4->protocol;
> }
>
> @@ -1364,7 +1364,7 @@ static void hns3_set_outer_l2l3l4(struct sk_buff *skb, u8 ol4_proto,
> static void hns3_set_l3_type(struct sk_buff *skb, union l3_hdr_info l3,
> u32 *type_cs_vlan_tso)
> {
> - if (l3.v4->version == 4) {
> + if (l3.v4->version == IP_VERSION_IPV4) {
> hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3T_S,
> HNS3_L3T_IPV4);
>
> @@ -1373,7 +1373,7 @@ static void hns3_set_l3_type(struct sk_buff *skb, union l3_hdr_info l3,
> */
> if (skb_is_gso(skb))
> hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3CS_B, 1);
> - } else if (l3.v6->version == 6) {
> + } else if (l3.v6->version == IP_VERSION_IPV6) {
> hns3_set_field(*type_cs_vlan_tso, HNS3_TXD_L3T_S,
> HNS3_L3T_IPV6);
> }
> diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
> index 557a5fa70d0a..93041352ef19 100644
> --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
> +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
> @@ -217,6 +217,9 @@ enum hns3_nic_state {
> #define HNS3_CQ_MODE_EQE 1U
> #define HNS3_CQ_MODE_CQE 0U
>
> +#define IP_VERSION_IPV4 0x4
> +#define IP_VERSION_IPV6 0x6
The more traditional way is to use sa_family_t sa_family and AF_XXX instead
of your .version variable.
Thanks
> +
> enum hns3_pkt_l2t_type {
> HNS3_L2_TYPE_UNICAST,
> HNS3_L2_TYPE_MULTICAST,
> --
> 2.33.0
>
next prev parent reply other threads:[~2022-09-28 10:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-27 11:12 [PATCH net-next 0/4] net: hns3: cleanup and optimization Guangbin Huang
2022-09-27 11:12 ` [PATCH net-next 1/4] net: hns3: refine the tcam key convert handle Guangbin Huang
2022-09-28 10:28 ` Leon Romanovsky
2022-11-15 14:12 ` Hao Lan
2022-09-27 11:12 ` [PATCH net-next 2/4] net: hns3: fix hns3 driver header file not self-contained issue Guangbin Huang
2022-09-27 11:12 ` [PATCH net-next 3/4] net: hns3: replace magic numbers with macro for IPv4/v6 Guangbin Huang
2022-09-28 10:34 ` Leon Romanovsky [this message]
2022-09-27 11:12 ` [PATCH net-next 4/4] net: hns3: delete unnecessary vf value judgement when get vport id Guangbin Huang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YzQjLu2jlEzm1lRo@unreal \
--to=leon@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=huangguangbin2@huawei.com \
--cc=kuba@kernel.org \
--cc=lanhao@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shenjian15@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).