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 v4 5/5] staging: r8188eu: incorrect type in assignment
Date: Mon, 23 Aug 2021 22:30:30 +0530 [thread overview]
Message-ID: <876b83dad76a6f561879da0db1fbb25b251374d4.1629563318.git.aakashhemadri123@gmail.com> (raw)
In-Reply-To: <cover.1629563318.git.aakashhemadri123@gmail.com>
Fix sparse warning:
> rtw_br_ext.c:516:57: warning: incorrect type in assignment
(different base types)
> rtw_br_ext.c:516:57: expected unsigned short
> rtw_br_ext.c:516:57: got restricted __be16 [usertype]
*pMagic holds __be16 change it's type to __be16
Signed-off-by: Aakash Hemadri <aakashhemadri123@gmail.com>
---
Incorrectly removed htons() to satisfy sparse warning. Instead make
pMagic use the appropriate bid endian type
drivers/staging/r8188eu/core/rtw_br_ext.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_br_ext.c b/drivers/staging/r8188eu/core/rtw_br_ext.c
index 83a4594a4214..14cf13516d34 100644
--- a/drivers/staging/r8188eu/core/rtw_br_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_br_ext.c
@@ -474,7 +474,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
/* Handle PPPoE frame */
/*---------------------------------------------------*/
struct pppoe_hdr *ph = (struct pppoe_hdr *)(skb->data + ETH_HLEN);
- unsigned short *pMagic;
+ __be16 *pMagic;
switch (method) {
case NAT25_CHECK:
@@ -512,7 +512,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)
tag->tag_len = htons(MAGIC_CODE_LEN+RTL_RELAY_TAG_LEN+old_tag_len);
/* insert the magic_code+client mac in relay tag */
- pMagic = (unsigned short *)tag->tag_data;
+ pMagic = (__be16 *)tag->tag_data;
*pMagic = htons(MAGIC_CODE);
memcpy(tag->tag_data+MAGIC_CODE_LEN, skb->data+ETH_ALEN, ETH_ALEN);
--
2.32.0
next prev parent reply other threads:[~2021-08-23 17:01 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-23 17:00 [PATCH v4 0/5] staging: r8188eu: fix sparse warnings Aakash Hemadri
2021-08-23 17:00 ` [PATCH v4 1/5] staging: r8188eu: restricted __be16 degrades to int Aakash Hemadri
2021-08-23 17:00 ` [PATCH v4 2/5] staging: r8188eu: cast to restricted __be32 Aakash Hemadri
2021-08-23 17:00 ` [PATCH v4 3/5] staging: r8188eu: incorrect type in csum_ipv6_magic Aakash Hemadri
2021-08-25 9:23 ` David Laight
2021-08-28 8:45 ` Aakash Hemadri
2021-08-23 17:00 ` [PATCH v4 4/5] staging: r8188eu: restricted __be16 degrades to int Aakash Hemadri
2021-08-23 17:00 ` Aakash Hemadri [this message]
2021-08-28 8:50 ` [PATCH v4 0/5] staging: r8188eu: fix sparse warnings Aakash Hemadri
2021-08-28 9:44 ` 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=876b83dad76a6f561879da0db1fbb25b251374d4.1629563318.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 \
--subject='Re: [PATCH v4 5/5] staging: r8188eu: incorrect type in assignment' \
/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
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).