[net-next PATCH] net: hsr: fix incorrect type usage for protocol variable

[net-next PATCH] net: hsr: fix incorrect type usage for protocol variable

[Murali Karicheri]

Fix following sparse checker warning:-

net/hsr/hsr_slave.c:38:18: warning: incorrect type in assignment (different base types)
net/hsr/hsr_slave.c:38:18:    expected unsigned short [unsigned] [usertype] protocol
net/hsr/hsr_slave.c:38:18:    got restricted __be16 [usertype] h_proto
net/hsr/hsr_slave.c:39:25: warning: restricted __be16 degrades to integer
net/hsr/hsr_slave.c:39:57: warning: restricted __be16 degrades to integer

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
---
 net/hsr/hsr_slave.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c
index f4b9f7a3ce51..25b6ffba26cd 100644
--- a/net/hsr/hsr_slave.c
+++ b/net/hsr/hsr_slave.c
@@ -18,7 +18,7 @@ static rx_handler_result_t hsr_handle_frame(struct sk_buff **pskb)
 {
 	struct sk_buff *skb = *pskb;
 	struct hsr_port *port;
-	u16 protocol;
+	__be16 protocol;
 
 	if (!skb_mac_header_was_set(skb)) {
 		WARN_ONCE(1, "%s: skb invalid", __func__);
-- 
2.17.1

Re: [net-next PATCH] net: hsr: fix incorrect type usage for protocol variable

[Vinicius Costa Gomes]

Hi Murali,

Murali Karicheri <m-karicheri2@ti.com> writes:

> Fix following sparse checker warning:-
>
> net/hsr/hsr_slave.c:38:18: warning: incorrect type in assignment (different base types)
> net/hsr/hsr_slave.c:38:18:    expected unsigned short [unsigned] [usertype] protocol
> net/hsr/hsr_slave.c:38:18:    got restricted __be16 [usertype] h_proto
> net/hsr/hsr_slave.c:39:25: warning: restricted __be16 degrades to integer
> net/hsr/hsr_slave.c:39:57: warning: restricted __be16 degrades to integer
>
> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
> ---

I think this patch should go via the net tree, as it is a warning fix.
Anyway...

Acked-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>


-- 
Vinicius

Re: [net-next PATCH] net: hsr: fix incorrect type usage for protocol variable

[Murali Karicheri]

Hi Vinicius,

On 5/6/20 1:33 PM, Vinicius Costa Gomes wrote:
> Hi Murali,
> 
> Murali Karicheri <m-karicheri2@ti.com> writes:
> 
>> Fix following sparse checker warning:-
>>
>> net/hsr/hsr_slave.c:38:18: warning: incorrect type in assignment (different base types)
>> net/hsr/hsr_slave.c:38:18:    expected unsigned short [unsigned] [usertype] protocol
>> net/hsr/hsr_slave.c:38:18:    got restricted __be16 [usertype] h_proto
>> net/hsr/hsr_slave.c:39:25: warning: restricted __be16 degrades to integer
>> net/hsr/hsr_slave.c:39:57: warning: restricted __be16 degrades to integer
>>
>> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
>> ---
> 
> I think this patch should go via the net tree, as it is a warning fix.
> Anyway...
> 
> Acked-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
> 
> 
Thanks. I will re-send it with net prefix and you ack. I thought since
this is just a warning, it is not that serious to include in net tree.

-- 
Murali Karicheri
Texas Instruments

Re: [net-next PATCH] net: hsr: fix incorrect type usage for protocol variable

[David Miller]

From: Murali Karicheri <m-karicheri2@ti.com>
Date: Wed, 6 May 2020 11:41:07 -0400

> Fix following sparse checker warning:-
> 
> net/hsr/hsr_slave.c:38:18: warning: incorrect type in assignment (different base types)
> net/hsr/hsr_slave.c:38:18:    expected unsigned short [unsigned] [usertype] protocol
> net/hsr/hsr_slave.c:38:18:    got restricted __be16 [usertype] h_proto
> net/hsr/hsr_slave.c:39:25: warning: restricted __be16 degrades to integer
> net/hsr/hsr_slave.c:39:57: warning: restricted __be16 degrades to integer
> 
> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>

Applied.