Commit 8d65cd8d authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

fou: remove sparse errors 



We need to add __rcu qualifier to avoid these errors:

net/ipv4/fou.c:250:18: warning: incorrect type in assignment (different address spaces)
net/ipv4/fou.c:250:18:    expected struct net_offload const **offloads
net/ipv4/fou.c:250:18:    got struct net_offload const [noderef] __rcu **
net/ipv4/fou.c:251:15: error: incompatible types in comparison expression (different address spaces):
net/ipv4/fou.c:251:15:    struct net_offload const [noderef] __rcu *
net/ipv4/fou.c:251:15:    struct net_offload const *
net/ipv4/fou.c:272:18: warning: incorrect type in assignment (different address spaces)
net/ipv4/fou.c:272:18:    expected struct net_offload const **offloads
net/ipv4/fou.c:272:18:    got struct net_offload const [noderef] __rcu **
net/ipv4/fou.c:273:15: error: incompatible types in comparison expression (different address spaces):
net/ipv4/fou.c:273:15:    struct net_offload const [noderef] __rcu *
net/ipv4/fou.c:273:15:    struct net_offload const *
net/ipv4/fou.c:442:18: warning: incorrect type in assignment (different address spaces)
net/ipv4/fou.c:442:18:    expected struct net_offload const **offloads
net/ipv4/fou.c:442:18:    got struct net_offload const [noderef] __rcu **
net/ipv4/fou.c:443:15: error: incompatible types in comparison expression (different address spaces):
net/ipv4/fou.c:443:15:    struct net_offload const [noderef] __rcu *
net/ipv4/fou.c:443:15:    struct net_offload const *
net/ipv4/fou.c:489:18: warning: incorrect type in assignment (different address spaces)
net/ipv4/fou.c:489:18:    expected struct net_offload const **offloads
net/ipv4/fou.c:489:18:    got struct net_offload const [noderef] __rcu **
net/ipv4/fou.c:490:15: error: incompatible types in comparison expression (different address spaces):
net/ipv4/fou.c:490:15:    struct net_offload const [noderef] __rcu *
net/ipv4/fou.c:490:15:    struct net_offload const *
net/ipv4/udp_offload.c:170:26: warning: incorrect type in assignment (different address spaces)
net/ipv4/udp_offload.c:170:26:    expected struct net_offload const **offloads
net/ipv4/udp_offload.c:170:26:    got struct net_offload const [noderef] __rcu **
net/ipv4/udp_offload.c:171:23: error: incompatible types in comparison expression (different address spaces):
net/ipv4/udp_offload.c:171:23:    struct net_offload const [noderef] __rcu *
net/ipv4/udp_offload.c:171:23:    struct net_offload const *

Fixes: efc98d08 ("fou: eliminate IPv4,v6 specific GRO functions")
Fixes: 8bce6d7d ("udp: Generalize skb_udp_segment")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 92548b0e

net/ipv4/fou.c

+5 −5
Original line number Diff line number Diff line
@@ -230,8 +230,8 @@ static struct sk_buff *fou_gro_receive(struct sock *sk, 
				       struct list_head *head,

				       struct sk_buff *skb)

{

	const struct net_offload __rcu **offloads;

	u8 proto = fou_from_sock(sk)->protocol;

	const struct net_offload **offloads;

	const struct net_offload *ops;

	struct sk_buff *pp = NULL;
@@ -263,10 +263,10 @@ static struct sk_buff *fou_gro_receive(struct sock *sk, 
static int fou_gro_complete(struct sock *sk, struct sk_buff *skb,

			    int nhoff)

{

	const struct net_offload *ops;

	const struct net_offload __rcu **offloads;

	u8 proto = fou_from_sock(sk)->protocol;

	const struct net_offload *ops;

	int err = -ENOSYS;

	const struct net_offload **offloads;



	rcu_read_lock();

	offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads;
@@ -311,7 +311,7 @@ static struct sk_buff *gue_gro_receive(struct sock *sk, 
				       struct list_head *head,

				       struct sk_buff *skb)

{

	const struct net_offload **offloads;

	const struct net_offload __rcu **offloads;

	const struct net_offload *ops;

	struct sk_buff *pp = NULL;

	struct sk_buff *p;
@@ -457,8 +457,8 @@ static struct sk_buff *gue_gro_receive(struct sock *sk, 


static int gue_gro_complete(struct sock *sk, struct sk_buff *skb, int nhoff)

{

	const struct net_offload **offloads;

	struct guehdr *guehdr = (struct guehdr *)(skb->data + nhoff);

	const struct net_offload __rcu **offloads;

	const struct net_offload *ops;

	unsigned int guehlen = 0;

	u8 proto;

net/ipv4/udp_offload.c

+1 −1
Original line number Diff line number Diff line
@@ -152,8 +152,8 @@ struct sk_buff *skb_udp_tunnel_segment(struct sk_buff *skb, 
				       netdev_features_t features,

				       bool is_ipv6)

{

	const struct net_offload __rcu **offloads;

	__be16 protocol = skb->protocol;

	const struct net_offload **offloads;

	const struct net_offload *ops;

	struct sk_buff *segs = ERR_PTR(-EINVAL);

	struct sk_buff *(*gso_inner_segment)(struct sk_buff *skb,