diff options
Diffstat (limited to 'net/ipv6/ip6_vti.c')
-rw-r--r-- | net/ipv6/ip6_vti.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index a045d543e507..1ec5b4a530d0 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c | |||
@@ -305,7 +305,7 @@ static int vti6_rcv(struct sk_buff *skb) | |||
305 | 305 | ||
306 | rcu_read_lock(); | 306 | rcu_read_lock(); |
307 | t = vti6_tnl_lookup(dev_net(skb->dev), &ipv6h->saddr, &ipv6h->daddr); | 307 | t = vti6_tnl_lookup(dev_net(skb->dev), &ipv6h->saddr, &ipv6h->daddr); |
308 | if (t != NULL) { | 308 | if (t) { |
309 | if (t->parms.proto != IPPROTO_IPV6 && t->parms.proto != 0) { | 309 | if (t->parms.proto != IPPROTO_IPV6 && t->parms.proto != 0) { |
310 | rcu_read_unlock(); | 310 | rcu_read_unlock(); |
311 | goto discard; | 311 | goto discard; |
@@ -736,7 +736,7 @@ vti6_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
736 | vti6_parm_from_user(&p1, &p); | 736 | vti6_parm_from_user(&p1, &p); |
737 | t = vti6_locate(net, &p1, cmd == SIOCADDTUNNEL); | 737 | t = vti6_locate(net, &p1, cmd == SIOCADDTUNNEL); |
738 | if (dev != ip6n->fb_tnl_dev && cmd == SIOCCHGTUNNEL) { | 738 | if (dev != ip6n->fb_tnl_dev && cmd == SIOCCHGTUNNEL) { |
739 | if (t != NULL) { | 739 | if (t) { |
740 | if (t->dev != dev) { | 740 | if (t->dev != dev) { |
741 | err = -EEXIST; | 741 | err = -EEXIST; |
742 | break; | 742 | break; |
@@ -1027,7 +1027,7 @@ static void __net_exit vti6_destroy_tunnels(struct vti6_net *ip6n) | |||
1027 | 1027 | ||
1028 | for (h = 0; h < HASH_SIZE; h++) { | 1028 | for (h = 0; h < HASH_SIZE; h++) { |
1029 | t = rtnl_dereference(ip6n->tnls_r_l[h]); | 1029 | t = rtnl_dereference(ip6n->tnls_r_l[h]); |
1030 | while (t != NULL) { | 1030 | while (t) { |
1031 | unregister_netdevice_queue(t->dev, &list); | 1031 | unregister_netdevice_queue(t->dev, &list); |
1032 | t = rtnl_dereference(t->next); | 1032 | t = rtnl_dereference(t->next); |
1033 | } | 1033 | } |