diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
| commit | 9f9f3e6e8548a596697778337110a423c384b6f3 (patch) | |
| tree | 5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /include/net | |
| parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) | |
Merge with Linux 2.3.49.
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/dn_neigh.h | 4 | ||||
| -rw-r--r-- | include/net/ip.h | 8 | ||||
| -rw-r--r-- | include/net/ipv6.h | 4 | ||||
| -rw-r--r-- | include/net/protocol.h | 4 | ||||
| -rw-r--r-- | include/net/sock.h | 2 |
5 files changed, 9 insertions, 13 deletions
diff --git a/include/net/dn_neigh.h b/include/net/dn_neigh.h index 7a1be0265..4887475e1 100644 --- a/include/net/dn_neigh.h +++ b/include/net/dn_neigh.h @@ -19,8 +19,8 @@ struct dn_neigh { extern void dn_neigh_init(void); extern void dn_neigh_cleanup(void); extern struct neighbour *dn_neigh_lookup(struct neigh_table *tbl, void *ptr); -extern void dn_neigh_router_hello(struct sk_buff *skb); -extern void dn_neigh_endnode_hello(struct sk_buff *skb); +extern int dn_neigh_router_hello(struct sk_buff *skb); +extern int dn_neigh_endnode_hello(struct sk_buff *skb); extern void dn_neigh_pointopoint_hello(struct sk_buff *skb); extern int dn_neigh_elist(struct net_device *dev, unsigned char *ptr, int n); diff --git a/include/net/ip.h b/include/net/ip.h index ecf397dbb..f3ab5ac7b 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -170,11 +170,9 @@ extern __inline__ int ip_send(struct sk_buff *skb) extern __inline__ int ip_decrease_ttl(struct iphdr *iph) { - u16 check = iph->check; - check = ntohs(check) + 0x0100; - if ((check & 0xFF00) == 0) - check++; /* carry overflow */ - iph->check = htons(check); + u32 check = iph->check; + check += __constant_htons(0x0100); + iph->check = check + (check>>16); return --iph->ttl; } diff --git a/include/net/ipv6.h b/include/net/ipv6.h index fe8865a3b..aef0d2619 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -4,7 +4,7 @@ * Authors: * Pedro Roque <roque@di.fc.ul.pt> * - * $Id: ipv6.h,v 1.19 2000/01/09 02:19:26 davem Exp $ + * $Id: ipv6.h,v 1.20 2000/02/27 19:51:38 davem Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -20,6 +20,8 @@ #include <net/ndisc.h> #include <net/flow.h> +#define SIN6_LEN_RFC2133 24 + /* * NextHeader field of IPv6 header */ diff --git a/include/net/protocol.h b/include/net/protocol.h index 53b58205e..0d8d4d99f 100644 --- a/include/net/protocol.h +++ b/include/net/protocol.h @@ -45,9 +45,6 @@ struct inet_protocol const char *name; }; -extern rwlock_t inet_protocol_lock; - - #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) struct inet6_protocol { @@ -65,7 +62,6 @@ struct inet6_protocol const char *name; }; -extern rwlock_t inet6_protocol_lock; #endif extern struct inet_protocol *inet_protocol_base; diff --git a/include/net/sock.h b/include/net/sock.h index 3bc870fc4..6782beca0 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -894,7 +894,7 @@ extern __inline__ void sk_filter_charge(struct sock *sk, struct sk_filter *fp) * socket is looked up by one cpu and unhasing is made by another CPU. * It is true for udp/raw, netlink (leak to receive and error queues), tcp * (leak to backlog). Packet socket does all the processing inside - * ptype_lock, so that it has not this race condition. UNIX sockets + * BR_NETPROTO_LOCK, so that it has not this race condition. UNIX sockets * use separate SMP lock, so that they are prone too. */ |