Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ipv6: gso: remove redundant locking

Browse source 
ipv6_gso_send_check() and ipv6_gso_segment() are called by
skb_mac_gso_segment() under rcu lock, no need to use
rcu_read_lock() / rcu_read_unlock()

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2013-10-18 14:43:55 -07:00 committed by David S. Miller
parent ea58c18062
commit b917eb155c
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
net/ipv6/ip6_offload.c
View file

@ -66,7 +66,6 @@ static int ipv6_gso_send_check(struct sk_buff *skb)
__skb_pull(skb, sizeof(*ipv6h)); __skb_pull(skb, sizeof(*ipv6h));
err = -EPROTONOSUPPORT; err = -EPROTONOSUPPORT;
rcu_read_lock();
ops = rcu_dereference(inet6_offloads[ ops = rcu_dereference(inet6_offloads[
ipv6_gso_pull_exthdrs(skb, ipv6h->nexthdr)]); ipv6_gso_pull_exthdrs(skb, ipv6h->nexthdr)]);
@ -74,7 +73,6 @@ static int ipv6_gso_send_check(struct sk_buff *skb)
skb_reset_transport_header(skb); skb_reset_transport_header(skb);
err = ops->callbacks.gso_send_check(skb); err = ops->callbacks.gso_send_check(skb);
} }
rcu_read_unlock();
out: out:
return err; return err;
@ -113,13 +111,12 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb,
segs = ERR_PTR(-EPROTONOSUPPORT); segs = ERR_PTR(-EPROTONOSUPPORT);
proto = ipv6_gso_pull_exthdrs(skb, ipv6h->nexthdr); proto = ipv6_gso_pull_exthdrs(skb, ipv6h->nexthdr);
rcu_read_lock();
ops = rcu_dereference(inet6_offloads[proto]); ops = rcu_dereference(inet6_offloads[proto]);
if (likely(ops && ops->callbacks.gso_segment)) { if (likely(ops && ops->callbacks.gso_segment)) {
skb_reset_transport_header(skb); skb_reset_transport_header(skb);
segs = ops->callbacks.gso_segment(skb, features); segs = ops->callbacks.gso_segment(skb, features);
} }
rcu_read_unlock();
if (IS_ERR(segs)) if (IS_ERR(segs))
goto out; goto out;