diff options
| author | zhong jiang <zhongjiang@huawei.com> | 2018-09-19 19:32:12 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-19 20:58:04 -0700 |
| commit | f195efb47d937bec8a2efb8e35a8ccf08dbbf777 (patch) | |
| tree | 95d5ca8edc43311744249b3afdf5ba504043e2f4 | |
| parent | cb205a817444f4838547e9f19438b96fdc32d5b6 (diff) | |
| download | lwn-f195efb47d937bec8a2efb8e35a8ccf08dbbf777.tar.gz lwn-f195efb47d937bec8a2efb8e35a8ccf08dbbf777.zip | |
net: core: Use FIELD_SIZEOF directly instead of reimplementing its function
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/flow_dissector.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index ce9eeeb7c024..1e745db44cc3 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -382,8 +382,8 @@ __skb_flow_dissect_gre(const struct sk_buff *skb, 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; @@ -405,11 +405,11 @@ __skb_flow_dissect_gre(const struct sk_buff *skb, 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)) { @@ -436,7 +436,7 @@ __skb_flow_dissect_gre(const struct sk_buff *skb, 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), |