aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/raw.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/raw.c')
-rw-r--r--net/ipv6/raw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index e33576df4658..79ccdb4c1b33 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -367,7 +367,7 @@ void raw6_icmp_error(struct sk_buff *skb, int nexthdr,
367 367
368 read_lock(&raw_v6_hashinfo.lock); 368 read_lock(&raw_v6_hashinfo.lock);
369 sk = sk_head(&raw_v6_hashinfo.ht[hash]); 369 sk = sk_head(&raw_v6_hashinfo.ht[hash]);
370 if (sk != NULL) { 370 if (sk) {
371 /* Note: ipv6_hdr(skb) != skb->data */ 371 /* Note: ipv6_hdr(skb) != skb->data */
372 const struct ipv6hdr *ip6h = (const struct ipv6hdr *)skb->data; 372 const struct ipv6hdr *ip6h = (const struct ipv6hdr *)skb->data;
373 saddr = &ip6h->saddr; 373 saddr = &ip6h->saddr;
@@ -1130,7 +1130,7 @@ static int rawv6_ioctl(struct sock *sk, int cmd, unsigned long arg)
1130 1130
1131 spin_lock_bh(&sk->sk_receive_queue.lock); 1131 spin_lock_bh(&sk->sk_receive_queue.lock);
1132 skb = skb_peek(&sk->sk_receive_queue); 1132 skb = skb_peek(&sk->sk_receive_queue);
1133 if (skb != NULL) 1133 if (skb)
1134 amount = skb_tail_pointer(skb) - 1134 amount = skb_tail_pointer(skb) -
1135 skb_transport_header(skb); 1135 skb_transport_header(skb);
1136 spin_unlock_bh(&sk->sk_receive_queue.lock); 1136 spin_unlock_bh(&sk->sk_receive_queue.lock);