From: zhong jiang <zhongjiang@huawei.com>
To: <davem@davemloft.net>
Cc: <ubraun@linux.ibm.com>, <jwi@linux.ibm.com>, <jhs@mojatatu.com>,
<xiyou.wangcong@gmail.com>, <Ariel.Elior@cavium.com>,
<everest-linux-l2@cavium.com>, <grygorii.strashko@ti.com>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<borntraeger@de.ibm.com>
Subject: [RESEND PATCH 3/5] net: core: Use FIELD_SIZEOF directly instead of reimplementing its function
Date: Wed, 19 Sep 2018 19:32:12 +0800 [thread overview]
Message-ID: <1537356734-51676-4-git-send-email-zhongjiang@huawei.com> (raw)
In-Reply-To: <1537356734-51676-1-git-send-email-zhongjiang@huawei.com>
FIELD_SIZEOF is defined as a macro to calculate the specified value. Therefore,
We prefer to use the macro rather than calculating its value.
Signed-off-by: zhong jiang <zhongjiang@huawei.com>
---
net/core/flow_dissector.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 5c5dd74..aeac884 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -423,8 +423,8 @@ __be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,
offset += sizeof(struct gre_base_hdr);
if (hdr->flags & GRE_CSUM)
- offset += sizeof(((struct gre_full_hdr *) 0)->csum) +
- sizeof(((struct gre_full_hdr *) 0)->reserved1);
+ offset += FIELD_SIZEOF(struct gre_full_hdr, csum) +
+ FIELD_SIZEOF(struct gre_full_hdr, reserved1);
if (hdr->flags & GRE_KEY) {
const __be32 *keyid;
@@ -446,11 +446,11 @@ __be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,
else
key_keyid->keyid = *keyid & GRE_PPTP_KEY_MASK;
}
- offset += sizeof(((struct gre_full_hdr *) 0)->key);
+ offset += FIELD_SIZEOF(struct gre_full_hdr, key);
}
if (hdr->flags & GRE_SEQ)
- offset += sizeof(((struct pptp_gre_header *) 0)->seq);
+ offset += FIELD_SIZEOF(struct pptp_gre_header, seq);
if (gre_ver == 0) {
if (*p_proto == htons(ETH_P_TEB)) {
@@ -477,7 +477,7 @@ __be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,
u8 *ppp_hdr;
if (hdr->flags & GRE_ACK)
- offset += sizeof(((struct pptp_gre_header *) 0)->ack);
+ offset += FIELD_SIZEOF(struct pptp_gre_header, ack);
ppp_hdr = __skb_header_pointer(skb, *p_nhoff + offset,
sizeof(_ppp_hdr),
--
1.7.12.4
next prev parent reply other threads:[~2018-09-19 11:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-19 11:32 [RESEND PATCH 0/5] net: Use FIELD_SIZEOF directly instead of reimplementing its function zhong jiang
2018-09-19 11:32 ` [RESEND PATCH 1/5] net: iucv: " zhong jiang
2018-09-19 11:32 ` [RESEND PATCH 2/5] net: sched: " zhong jiang
2018-09-19 11:32 ` zhong jiang [this message]
2018-09-19 11:32 ` [RESEND PATCH 4/5] net: qede: " zhong jiang
2018-09-19 11:32 ` [RESEND PATCH 5/5] net: ti: " zhong jiang
2018-09-20 3:58 ` [RESEND PATCH 0/5] net: " David Miller
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=1537356734-51676-4-git-send-email-zhongjiang@huawei.com \
--to=zhongjiang@huawei.com \
--cc=Ariel.Elior@cavium.com \
--cc=borntraeger@de.ibm.com \
--cc=davem@davemloft.net \
--cc=everest-linux-l2@cavium.com \
--cc=grygorii.strashko@ti.com \
--cc=jhs@mojatatu.com \
--cc=jwi@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=ubraun@linux.ibm.com \
--cc=xiyou.wangcong@gmail.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).