patch-2.4.20 linux-2.4.20/net/ipv6/ip6_output.c
Next file: linux-2.4.20/net/ipv6/ndisc.c
Previous file: linux-2.4.20/net/ipv6/ip6_fib.c
Back to the patch index
Back to the overall index
- Lines: 27
- Date:
Thu Nov 28 15:53:15 2002
- Orig file:
linux-2.4.19/net/ipv6/ip6_output.c
- Orig date:
Thu Sep 20 14:12:56 2001
diff -urN linux-2.4.19/net/ipv6/ip6_output.c linux-2.4.20/net/ipv6/ip6_output.c
@@ -101,7 +101,7 @@
struct dst_entry *dst = skb->dst;
struct net_device *dev = dst->dev;
- skb->protocol = __constant_htons(ETH_P_IPV6);
+ skb->protocol = htons(ETH_P_IPV6);
skb->dev = dev;
if (ipv6_addr_is_multicast(&skb->nh.ipv6h->daddr)) {
@@ -221,7 +221,7 @@
* Fill in the IPv6 header
*/
- *(u32*)hdr = __constant_htonl(0x60000000) | fl->fl6_flowlabel;
+ *(u32*)hdr = htonl(0x60000000) | fl->fl6_flowlabel;
hlimit = -1;
if (np)
hlimit = np->hop_limit;
@@ -262,7 +262,7 @@
struct ipv6hdr *hdr;
int totlen;
- skb->protocol = __constant_htons(ETH_P_IPV6);
+ skb->protocol = htons(ETH_P_IPV6);
skb->dev = dev;
totlen = len + sizeof(struct ipv6hdr);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)