linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Aakash Hemadri <aakashhemadri123@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Larry Finger <Larry.Finger@lwfinger.net>,
	Phillip Potter <phil@philpotter.co.uk>
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH v3 4/5] staging: r8188eu: restricted __be16 degrades to int
Date: Sat, 21 Aug 2021 21:48:31 +0530	[thread overview]
Message-ID: <464cbdb48b238d6b3aca435ef4f0bd05d48e01c6.1629562355.git.aakashhemadri123@gmail.com> (raw)
In-Reply-To: <cover.1629562355.git.aakashhemadri123@gmail.com>

Fix sparse warning:
> rtw_br_ext.c:839:70: warning: restricted __be16 degrades to integer
> rtw_br_ext.c:845:70: warning: invalid assignment: |=
> rtw_br_ext.c:845:70:    left side has type unsigned short
> rtw_br_ext.c:845:70:    right side has type restricted __be16

dhcp->flags is be16, so change its type to that.
Change htons() to cpu_to_be16() for clarity.

Signed-off-by: Aakash Hemadri <aakashhemadri123@gmail.com>
---
 drivers/staging/r8188eu/core/rtw_br_ext.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_br_ext.c b/drivers/staging/r8188eu/core/rtw_br_ext.c
index 26606093a3c3..83a4594a4214 100644
--- a/drivers/staging/r8188eu/core/rtw_br_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_br_ext.c
@@ -641,7 +641,7 @@ struct dhcpMessage {
 	u_int8_t hops;
 	u_int32_t xid;
 	u_int16_t secs;
-	u_int16_t flags;
+	__be16 flags;
 	u_int32_t ciaddr;
 	u_int32_t yiaddr;
 	u_int32_t siaddr;
@@ -674,13 +674,13 @@ void dhcp_flag_bcast(struct adapter *priv, struct sk_buff *skb)
 					u32 cookie = be32_to_cpu(dhcph->cookie);
 
 					if (cookie == DHCP_MAGIC) { /*  match magic word */
-						if (!(dhcph->flags & htons(BROADCAST_FLAG))) {
+						if (!(dhcph->flags & cpu_to_be16(BROADCAST_FLAG))) {
 							/*  if not broadcast */
 							register int sum = 0;
 
 							DEBUG_INFO("DHCP: change flag of DHCP request to broadcast.\n");
 							/*  or BROADCAST flag */
-							dhcph->flags |= htons(BROADCAST_FLAG);
+							dhcph->flags |= cpu_to_be16(BROADCAST_FLAG);
 							/*  recalculate checksum */
 							sum = ~(udph->check) & 0xffff;
 							sum += be16_to_cpu(dhcph->flags);
-- 
2.32.0


  parent reply	other threads:[~2021-08-21 16:19 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-21 16:18 [PATCH v3 0/5] staging: r8188eu: fix sparse warnings Aakash Hemadri
2021-08-21 16:18 ` [PATCH v3 1/5] staging: r8188eu: restricted __be16 degrades to int Aakash Hemadri
2021-08-21 17:23   ` Phillip Potter
2021-08-21 16:18 ` [PATCH v3 2/5] staging: r8188eu: cast to restricted __be32 Aakash Hemadri
2021-08-23  8:44   ` Aakash Hemadri
2021-08-23 14:24     ` Larry Finger
2021-08-25  9:13       ` David Laight
2021-08-25  9:19         ` Dan Carpenter
2021-08-25 10:21           ` David Laight
2021-08-25 10:39             ` Dan Carpenter
2021-08-21 16:18 ` [PATCH v3 3/5] staging: r8188eu: incorrect type in csum_ipv6_magic Aakash Hemadri
2021-08-21 16:18 ` Aakash Hemadri [this message]
2021-08-21 16:18 ` [PATCH v3 5/5] staging: r8188eu: incorrect type in assignment Aakash Hemadri
2021-08-22 20:25   ` Larry Finger
2021-08-21 16:20 ` [PATCH v3 0/5] staging: r8188eu: fix sparse warnings Greg Kroah-Hartman

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=464cbdb48b238d6b3aca435ef4f0bd05d48e01c6.1629562355.git.aakashhemadri123@gmail.com \
    --to=aakashhemadri123@gmail.com \
    --cc=Larry.Finger@lwfinger.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --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;
as well as URLs for NNTP newsgroup(s).