patch-2.4.20 linux-2.4.20/net/ipv6/sit.c
Next file: linux-2.4.20/net/ipv6/tcp_ipv6.c
Previous file: linux-2.4.20/net/ipv6/route.c
Back to the patch index
Back to the overall index
- Lines: 40
- Date:
Thu Nov 28 15:53:15 2002
- Orig file:
linux-2.4.19/net/ipv6/sit.c
- Orig date:
Fri Aug 2 17:39:46 2002
diff -urN linux-2.4.19/net/ipv6/sit.c linux-2.4.20/net/ipv6/sit.c
@@ -396,7 +396,7 @@
skb->mac.raw = skb->nh.raw;
skb->nh.raw = skb->data;
memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
- skb->protocol = __constant_htons(ETH_P_IPV6);
+ skb->protocol = htons(ETH_P_IPV6);
skb->pkt_type = PACKET_HOST;
tunnel->stat.rx_packets++;
tunnel->stat.rx_bytes += skb->len;
@@ -470,7 +470,7 @@
goto tx_error;
}
- if (skb->protocol != __constant_htons(ETH_P_IPV6))
+ if (skb->protocol != htons(ETH_P_IPV6))
goto tx_error;
if (!dst)
@@ -588,7 +588,7 @@
iph->version = 4;
iph->ihl = sizeof(struct iphdr)>>2;
if (mtu > IPV6_MIN_MTU)
- iph->frag_off = __constant_htons(IP_DF);
+ iph->frag_off = htons(IP_DF);
else
iph->frag_off = 0;
@@ -659,10 +659,10 @@
err = -EINVAL;
if (p.iph.version != 4 || p.iph.protocol != IPPROTO_IPV6 ||
- p.iph.ihl != 5 || (p.iph.frag_off&__constant_htons(~IP_DF)))
+ p.iph.ihl != 5 || (p.iph.frag_off&htons(~IP_DF)))
goto done;
if (p.iph.ttl)
- p.iph.frag_off |= __constant_htons(IP_DF);
+ p.iph.frag_off |= htons(IP_DF);
t = ipip6_tunnel_locate(&p, cmd == SIOCADDTUNNEL);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)