diff options
Diffstat (limited to 'net/ipv6/xfrm6_tunnel.c')
| -rw-r--r-- | net/ipv6/xfrm6_tunnel.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index 12e426b9aa..fb0228772f 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c | |||
| @@ -5,12 +5,12 @@ | |||
| 5 | * it under the terms of the GNU General Public License as published by | 5 | * it under the terms of the GNU General Public License as published by |
| 6 | * the Free Software Foundation; either version 2 of the License, or | 6 | * the Free Software Foundation; either version 2 of the License, or |
| 7 | * (at your option) any later version. | 7 | * (at your option) any later version. |
| 8 | * | 8 | * |
| 9 | * This program is distributed in the hope that it will be useful, | 9 | * This program is distributed in the hope that it will be useful, |
| 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 12 | * GNU General Public License for more details. | 12 | * GNU General Public License for more details. |
| 13 | * | 13 | * |
| 14 | * You should have received a copy of the GNU General Public License | 14 | * You should have received a copy of the GNU General Public License |
| 15 | * along with this program; if not, write to the Free Software | 15 | * along with this program; if not, write to the Free Software |
| 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| @@ -32,7 +32,7 @@ | |||
| 32 | #include <linux/mutex.h> | 32 | #include <linux/mutex.h> |
| 33 | 33 | ||
| 34 | /* | 34 | /* |
| 35 | * xfrm_tunnel_spi things are for allocating unique id ("spi") | 35 | * xfrm_tunnel_spi things are for allocating unique id ("spi") |
| 36 | * per xfrm_address_t. | 36 | * per xfrm_address_t. |
| 37 | */ | 37 | */ |
| 38 | struct xfrm6_tunnel_spi { | 38 | struct xfrm6_tunnel_spi { |
| @@ -155,8 +155,8 @@ static u32 __xfrm6_tunnel_alloc_spi(xfrm_address_t *saddr) | |||
| 155 | 155 | ||
| 156 | for (spi = xfrm6_tunnel_spi; spi <= XFRM6_TUNNEL_SPI_MAX; spi++) { | 156 | for (spi = xfrm6_tunnel_spi; spi <= XFRM6_TUNNEL_SPI_MAX; spi++) { |
| 157 | index = xfrm6_tunnel_spi_hash_byspi(spi); | 157 | index = xfrm6_tunnel_spi_hash_byspi(spi); |
| 158 | hlist_for_each_entry(x6spi, pos, | 158 | hlist_for_each_entry(x6spi, pos, |
| 159 | &xfrm6_tunnel_spi_byspi[index], | 159 | &xfrm6_tunnel_spi_byspi[index], |
| 160 | list_byspi) { | 160 | list_byspi) { |
| 161 | if (x6spi->spi == spi) | 161 | if (x6spi->spi == spi) |
| 162 | goto try_next_1; | 162 | goto try_next_1; |
| @@ -167,8 +167,8 @@ try_next_1:; | |||
| 167 | } | 167 | } |
| 168 | for (spi = XFRM6_TUNNEL_SPI_MIN; spi < xfrm6_tunnel_spi; spi++) { | 168 | for (spi = XFRM6_TUNNEL_SPI_MIN; spi < xfrm6_tunnel_spi; spi++) { |
| 169 | index = xfrm6_tunnel_spi_hash_byspi(spi); | 169 | index = xfrm6_tunnel_spi_hash_byspi(spi); |
| 170 | hlist_for_each_entry(x6spi, pos, | 170 | hlist_for_each_entry(x6spi, pos, |
| 171 | &xfrm6_tunnel_spi_byspi[index], | 171 | &xfrm6_tunnel_spi_byspi[index], |
| 172 | list_byspi) { | 172 | list_byspi) { |
| 173 | if (x6spi->spi == spi) | 173 | if (x6spi->spi == spi) |
| 174 | goto try_next_2; | 174 | goto try_next_2; |
| @@ -222,7 +222,7 @@ void xfrm6_tunnel_free_spi(xfrm_address_t *saddr) | |||
| 222 | 222 | ||
| 223 | write_lock_bh(&xfrm6_tunnel_spi_lock); | 223 | write_lock_bh(&xfrm6_tunnel_spi_lock); |
| 224 | 224 | ||
| 225 | hlist_for_each_entry_safe(x6spi, pos, n, | 225 | hlist_for_each_entry_safe(x6spi, pos, n, |
| 226 | &xfrm6_tunnel_spi_byaddr[xfrm6_tunnel_spi_hash_byaddr(saddr)], | 226 | &xfrm6_tunnel_spi_byaddr[xfrm6_tunnel_spi_hash_byaddr(saddr)], |
| 227 | list_byaddr) | 227 | list_byaddr) |
| 228 | { | 228 | { |
| @@ -269,9 +269,9 @@ static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
| 269 | { | 269 | { |
| 270 | /* xfrm6_tunnel native err handling */ | 270 | /* xfrm6_tunnel native err handling */ |
| 271 | switch (type) { | 271 | switch (type) { |
| 272 | case ICMPV6_DEST_UNREACH: | 272 | case ICMPV6_DEST_UNREACH: |
| 273 | switch (code) { | 273 | switch (code) { |
| 274 | case ICMPV6_NOROUTE: | 274 | case ICMPV6_NOROUTE: |
| 275 | case ICMPV6_ADM_PROHIBITED: | 275 | case ICMPV6_ADM_PROHIBITED: |
| 276 | case ICMPV6_NOT_NEIGHBOUR: | 276 | case ICMPV6_NOT_NEIGHBOUR: |
| 277 | case ICMPV6_ADDR_UNREACH: | 277 | case ICMPV6_ADDR_UNREACH: |
| @@ -287,7 +287,7 @@ static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
| 287 | case ICMPV6_EXC_HOPLIMIT: | 287 | case ICMPV6_EXC_HOPLIMIT: |
| 288 | break; | 288 | break; |
| 289 | case ICMPV6_EXC_FRAGTIME: | 289 | case ICMPV6_EXC_FRAGTIME: |
| 290 | default: | 290 | default: |
| 291 | break; | 291 | break; |
| 292 | } | 292 | } |
| 293 | break; | 293 | break; |
