From: Joash Naidoo <joash.n09@gmail.com>
To: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
paskripkin@gmail.com, dan.carpenter@oracle.com,
gregkh@linuxfoundation.org
Cc: linux-staging@lists.linux.dev, Joash Naidoo <joash.n09@gmail.com>
Subject: [PATCH v2] staging: r8188eu: fix too many leading tabs
Date: Mon, 19 Sep 2022 13:51:11 +0200 [thread overview]
Message-ID: <20220919115111.2421-1-joash.n09@gmail.com> (raw)
Coding style fix. Fix too many leading tabs and line length.
Signed-off-by: Joash Naidoo <joash.n09@gmail.com>
---
Changes in v2:
- Flip additional nested if conditions and don't reverse the last if statement
- Move declarations to start of function
- Separate converting __constant_htons to htons to another patch
---
drivers/staging/r8188eu/core/rtw_br_ext.c | 69 ++++++++++++-----------
1 file changed, 36 insertions(+), 33 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_br_ext.c b/drivers/staging/r8188eu/core/rtw_br_ext.c
index bca20fe5c..2fec3bf39 100644
--- a/drivers/staging/r8188eu/core/rtw_br_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_br_ext.c
@@ -601,42 +601,45 @@ struct dhcpMessage {
void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb)
{
+ __be16 protocol = *((__be16 *)(skb->data + 2 * ETH_ALEN));
+ struct iphdr *iph = (struct iphdr *)(skb->data + ETH_HLEN);
+ struct udphdr *udph = (struct udphdr *)((size_t)iph + (iph->ihl << 2));
+ /* DHCP request */
+ struct dhcpMessage *dhcph =
+ (struct dhcpMessage *)((size_t)udph + sizeof(struct udphdr));
+ u32 cookie = be32_to_cpu((__be32)dhcph->cookie);
+
if (!skb)
return;
- if (!priv->ethBrExtInfo.dhcp_bcst_disable) {
- __be16 protocol = *((__be16 *)(skb->data + 2 * ETH_ALEN));
-
- if (protocol == __constant_htons(ETH_P_IP)) { /* IP */
- struct iphdr *iph = (struct iphdr *)(skb->data + ETH_HLEN);
-
- if (iph->protocol == IPPROTO_UDP) { /* UDP */
- struct udphdr *udph = (struct udphdr *)((size_t)iph + (iph->ihl << 2));
-
- if ((udph->source == __constant_htons(CLIENT_PORT)) &&
- (udph->dest == __constant_htons(SERVER_PORT))) { /* DHCP request */
- struct dhcpMessage *dhcph =
- (struct dhcpMessage *)((size_t)udph + sizeof(struct udphdr));
- u32 cookie = be32_to_cpu((__be32)dhcph->cookie);
-
- if (cookie == DHCP_MAGIC) { /* match magic word */
- if (!(dhcph->flags & htons(BROADCAST_FLAG))) {
- /* if not broadcast */
- register int sum = 0;
-
- /* or BROADCAST flag */
- dhcph->flags |= htons(BROADCAST_FLAG);
- /* recalculate checksum */
- sum = ~(udph->check) & 0xffff;
- sum += be16_to_cpu(dhcph->flags);
- while (sum >> 16)
- sum = (sum & 0xffff) + (sum >> 16);
- udph->check = ~sum;
- }
- }
- }
- }
- }
+ if (priv->ethBrExtInfo.dhcp_bcst_disable)
+ return;
+
+ if (protocol != htons(ETH_P_IP)) /* IP */
+ return;
+
+ if (iph->protocol != IPPROTO_UDP) /* UDP */
+ return;
+
+ if ((udph->source != __constant_htons(CLIENT_PORT)) &&
+ (udph->dest != __constant_htons(SERVER_PORT)))
+ return;
+
+ if (cookie != DHCP_MAGIC) /* match magic word */
+ return;
+
+ if (!(dhcph->flags & htons(BROADCAST_FLAG))) {
+ /* if not broadcast */
+ register int sum = 0;
+
+ /* or BROADCAST flag */
+ dhcph->flags |= htons(BROADCAST_FLAG);
+ /* recalculate checksum */
+ sum = ~(udph->check) & 0xffff;
+ sum += be16_to_cpu(dhcph->flags);
+ while (sum >> 16)
+ sum = (sum & 0xffff) + (sum >> 16);
+ udph->check = ~sum;
}
}
--
2.35.1
next reply other threads:[~2022-09-19 11:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-19 11:51 Joash Naidoo [this message]
2022-09-19 12:08 ` [PATCH v2] staging: r8188eu: fix too many leading tabs Dan Carpenter
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=20220919115111.2421-1-joash.n09@gmail.com \
--to=joash.n09@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-staging@lists.linux.dev \
--cc=paskripkin@gmail.com \
--cc=phil@philpotter.co.uk \
/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