Commit 9b14d1f8 authored Jun 28, 2020 by Horatiu Vultur Committed by David S. Miller Jun 28, 2020

bridge: mrp: Fix endian conversion and some other warnings

The following sparse warnings are fixed:
net/bridge/br_mrp.c:106:18: warning: incorrect type in assignment (different base types)
net/bridge/br_mrp.c:106:18: expected unsigned short [usertype]
net/bridge/br_mrp.c:106:18: got restricted __be16 [usertype]
net/bridge/br_mrp.c:281:23: warning: incorrect type in argument 1 (different modifiers)
net/bridge/br_mrp.c:281:23: expected struct list_head *entry
net/bridge/br_mrp.c:281:23: got struct list_head [noderef] *
net/bridge/br_mrp.c:332:28: warning: incorrect type in argument 1 (different modifiers)
net/bridge/br_mrp.c:332:28: expected struct list_head *new
net/bridge/br_mrp.c:332:28: got struct list_head [noderef] *
net/bridge/br_mrp.c:332:40: warning: incorrect type in argument 2 (different modifiers)
net/bridge/br_mrp.c:332:40: expected struct list_head *head
net/bridge/br_mrp.c:332:40: got struct list_head [noderef] *
net/bridge/br_mrp.c:682:29: warning: incorrect type in argument 1 (different modifiers)
net/bridge/br_mrp.c:682:29: expected struct list_head const *head
net/bridge/br_mrp.c:682:29: got struct list_head [noderef] *

Reported-by: kernel test robot <lkp@intel.com>
Fixes: 2f1a11ae ("bridge: mrp: Add MRP interface.")
Fixes: 4b8d7d4c ("bridge: mrp: Extend bridge interface")
Fixes: 9a9f26e8 ("bridge: mrp: Connect MRP API with the switchdev API")
Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 2ce578ca

net/bridge/br_mrp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@ static struct sk_buff br_mrp_skb_alloc(struct net_bridge_port p,
		{
		struct ethhdr *eth_hdr;
		struct sk_buff *skb;
		u16 *version;
		__be16 *version;

		skb = dev_alloc_skb(MRP_MAX_FRAME_LENGTH);
		if (!skb)

net/bridge/br_private.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -430,7 +430,7 @@ struct net_bridge {
		struct hlist_head fdb_list;

		#if IS_ENABLED(CONFIG_BRIDGE_MRP)
		struct list_head __rcu mrp_list;
		struct list_head mrp_list;
		#endif
		};

net/bridge/br_private_mrp.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@

		struct br_mrp {
		/* list of mrp instances */
		struct list_head __rcu list;
		struct list_head list;

		struct net_bridge_port __rcu *p_port;
		struct net_bridge_port __rcu *s_port;

Admin message