diff options
Diffstat (limited to 'net/ipv6/sit.c')
-rw-r--r-- | net/ipv6/sit.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 47cfeadac6dd..4d3cf301e1fc 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * Linux INET6 implementation | 3 | * Linux INET6 implementation |
4 | * | 4 | * |
5 | * Authors: | 5 | * Authors: |
6 | * Pedro Roque <roque@di.fc.ul.pt> | 6 | * Pedro Roque <roque@di.fc.ul.pt> |
7 | * Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> | 7 | * Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> |
8 | * | 8 | * |
9 | * $Id: sit.c,v 1.53 2001/09/25 05:09:53 davem Exp $ | 9 | * $Id: sit.c,v 1.53 2001/09/25 05:09:53 davem Exp $ |
@@ -410,7 +410,7 @@ static inline __be32 try_6to4(struct in6_addr *v6dst) | |||
410 | __be32 dst = 0; | 410 | __be32 dst = 0; |
411 | 411 | ||
412 | if (v6dst->s6_addr16[0] == htons(0x2002)) { | 412 | if (v6dst->s6_addr16[0] == htons(0x2002)) { |
413 | /* 6to4 v6 addr has 16 bits prefix, 32 v4addr, 16 SLA, ... */ | 413 | /* 6to4 v6 addr has 16 bits prefix, 32 v4addr, 16 SLA, ... */ |
414 | memcpy(&dst, &v6dst->s6_addr16[1], 4); | 414 | memcpy(&dst, &v6dst->s6_addr16[1], 4); |
415 | } | 415 | } |
416 | return dst; | 416 | return dst; |
@@ -434,7 +434,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
434 | int max_headroom; /* The extra header space needed */ | 434 | int max_headroom; /* The extra header space needed */ |
435 | __be32 dst = tiph->daddr; | 435 | __be32 dst = tiph->daddr; |
436 | int mtu; | 436 | int mtu; |
437 | struct in6_addr *addr6; | 437 | struct in6_addr *addr6; |
438 | int addr_type; | 438 | int addr_type; |
439 | 439 | ||
440 | if (tunnel->recursion++) { | 440 | if (tunnel->recursion++) { |
@@ -537,7 +537,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
537 | struct sk_buff *new_skb = skb_realloc_headroom(skb, max_headroom); | 537 | struct sk_buff *new_skb = skb_realloc_headroom(skb, max_headroom); |
538 | if (!new_skb) { | 538 | if (!new_skb) { |
539 | ip_rt_put(rt); | 539 | ip_rt_put(rt); |
540 | stats->tx_dropped++; | 540 | stats->tx_dropped++; |
541 | dev_kfree_skb(skb); | 541 | dev_kfree_skb(skb); |
542 | tunnel->recursion--; | 542 | tunnel->recursion--; |
543 | return 0; | 543 | return 0; |
@@ -831,7 +831,7 @@ static int __init sit_init(void) | |||
831 | return -EAGAIN; | 831 | return -EAGAIN; |
832 | } | 832 | } |
833 | 833 | ||
834 | ipip6_fb_tunnel_dev = alloc_netdev(sizeof(struct ip_tunnel), "sit0", | 834 | ipip6_fb_tunnel_dev = alloc_netdev(sizeof(struct ip_tunnel), "sit0", |
835 | ipip6_tunnel_setup); | 835 | ipip6_tunnel_setup); |
836 | if (!ipip6_fb_tunnel_dev) { | 836 | if (!ipip6_fb_tunnel_dev) { |
837 | err = -ENOMEM; | 837 | err = -ENOMEM; |