diff options
Diffstat (limited to 'net/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 193d0c6c5ce2..510d31f3cb96 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
| @@ -1014,9 +1014,12 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 1014 | ip6rd.prefixlen); | 1014 | ip6rd.prefixlen); |
| 1015 | if (!ipv6_addr_equal(&prefix, &ip6rd.prefix)) | 1015 | if (!ipv6_addr_equal(&prefix, &ip6rd.prefix)) |
| 1016 | goto done; | 1016 | goto done; |
| 1017 | relay_prefix = ip6rd.relay_prefix & | 1017 | if (ip6rd.relay_prefixlen) |
| 1018 | htonl(0xffffffffUL << | 1018 | relay_prefix = ip6rd.relay_prefix & |
| 1019 | (32 - ip6rd.relay_prefixlen)); | 1019 | htonl(0xffffffffUL << |
| 1020 | (32 - ip6rd.relay_prefixlen)); | ||
| 1021 | else | ||
| 1022 | relay_prefix = 0; | ||
| 1020 | if (relay_prefix != ip6rd.relay_prefix) | 1023 | if (relay_prefix != ip6rd.relay_prefix) |
| 1021 | goto done; | 1024 | goto done; |
| 1022 | 1025 | ||