diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /net/ipv6/ip6_output.c | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 0f1c710d3..eb3984f55 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -5,7 +5,7 @@ * Authors: * Pedro Roque <roque@di.fc.ul.pt> * - * $Id: ip6_output.c,v 1.10 1998/03/20 09:12:17 davem Exp $ + * $Id: ip6_output.c,v 1.12 1998/04/11 22:11:06 davem Exp $ * * Based on linux/net/ipv4/ip_output.c * @@ -75,7 +75,6 @@ int ip6_output(struct sk_buff *skb) } else if (dst->neighbour) return dst->neighbour->output(skb); - printk(KERN_DEBUG "khm\n"); kfree_skb(skb); return -EINVAL; } @@ -265,7 +264,6 @@ static int ip6_frag_xmit(struct sock *sk, inet_getfrag_t getfrag, return err; last_skb->dst = dst_clone(dst); - last_skb->when = jiffies; skb_reserve(last_skb, (dst->dev->hard_header_len + 15) & ~15); @@ -461,8 +459,6 @@ int ip6_build_xmit(struct sock *sk, inet_getfrag_t getfrag, const void *data, dev = dst->dev; skb->dst = dst_clone(dst); - skb->when = jiffies; - skb_reserve(skb, (dev->hard_header_len + 15) & ~15); hdr = (struct ipv6hdr *) skb->tail; |