Sparse generates two warnings related to incorrect type in assignment.
This patch changes the types in the struct defined in unisys
Signed-off-by: Andrea Ghittino <[email protected]>
---
Compile tested only
iochannel.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/unisys/include/iochannel.h b/drivers/staging/unisys/include/iochannel.h
index 54f4900..41e5b4e 100644
--- a/drivers/staging/unisys/include/iochannel.h
+++ b/drivers/staging/unisys/include/iochannel.h
@@ -308,8 +308,8 @@ struct net_pkt_xmt {
u8 valid; /* 1 = struct is valid - else ignore */
u8 hrawoffv; /* 1 = hwrafoff is valid */
u8 nhrawoffv; /* 1 = nhwrafoff is valid */
- u16 protocol; /* specifies packet protocol */
- u32 csum; /* value used to set skb->csum at IOPart */
+ __be16 protocol; /* specifies packet protocol */
+ __wsum csum; /* value used to set skb->csum at IOPart */
u32 hrawoff; /* value used to set skb->h.raw at IOPart */
/* hrawoff points to the start of the TRANSPORT LAYER HEADER */
u32 nhrawoff; /* value used to set skb->nh.raw at IOPart */
> -----Original Message-----
> From: Andrea Ghittino [mailto:[email protected]]
> Sent: Saturday, March 4, 2017 12:21 PM
> To: [email protected]; Kershner, David A
> <[email protected]>; [email protected]; *S-Par-
> Maintainer <[email protected]>; [email protected]
> Subject: [PATCH] staging: unisys: fix sparse warnings
>
> Sparse generates two warnings related to incorrect type in assignment.
> This patch changes the types in the struct defined in unisys
>
> Signed-off-by: Andrea Ghittino <[email protected]>
Acked-by: David Kershner <[email protected]>
Tested it on s-Par and no problems.
> ---
> Compile tested only
>
> iochannel.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/unisys/include/iochannel.h
> b/drivers/staging/unisys/include/iochannel.h
> index 54f4900..41e5b4e 100644
> --- a/drivers/staging/unisys/include/iochannel.h
> +++ b/drivers/staging/unisys/include/iochannel.h
> @@ -308,8 +308,8 @@ struct net_pkt_xmt {
> u8 valid; /* 1 = struct is valid - else ignore */
> u8 hrawoffv; /* 1 = hwrafoff is valid */
> u8 nhrawoffv; /* 1 = nhwrafoff is valid */
> - u16 protocol; /* specifies packet protocol */
> - u32 csum; /* value used to set skb->csum at IOPart */
> + __be16 protocol; /* specifies packet protocol */
> + __wsum csum; /* value used to set skb->csum at IOPart */
> u32 hrawoff; /* value used to set skb->h.raw at IOPart */
> /* hrawoff points to the start of the TRANSPORT LAYER
> HEADER */
> u32 nhrawoff; /* value used to set skb->nh.raw at IOPart */
On Tue, Mar 07, 2017 at 11:17:36PM +0300, Dan Carpenter wrote:
> On Sat, Mar 04, 2017 at 06:20:50PM +0100, Andrea Ghittino wrote:
> > Sparse generates two warnings related to incorrect type in assignment.
> > This patch changes the types in the struct defined in unisys
>
> Can you post the Sparse warning? Otherwise when I'm reviewing this
> code I have to re-run Sparse to see what you're talking about.
>
> regards,
> dan carpenter
Here you can find sparse warnings:
drivers/staging/unisys/visornic/visornic_main.c:844:50: warning: incorrect type in assignment (different base types)
drivers/staging/unisys/visornic/visornic_main.c:844:50: expected unsigned short [unsigned] [usertype] protocol
drivers/staging/unisys/visornic/visornic_main.c:844:50: got restricted __be16 [usertype] protocol
drivers/staging/unisys/visornic/visornic_main.c:855:46: warning: incorrect type in assignment (different base types)
drivers/staging/unisys/visornic/visornic_main.c:855:46: expected unsigned int [unsigned] [usertype] csum
drivers/staging/unisys/visornic/visornic_main.c:855:46: got restricted __wsum [usertype] csum
andrea
On Sat, Mar 04, 2017 at 06:20:50PM +0100, Andrea Ghittino wrote:
> Sparse generates two warnings related to incorrect type in assignment.
> This patch changes the types in the struct defined in unisys
Can you post the Sparse warning? Otherwise when I'm reviewing this
code I have to re-run Sparse to see what you're talking about.
regards,
dan carpenter