diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-06 19:43:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-06 19:43:41 -0700 |
| commit | 38b4e74829cc1b7a0870848f9c0900a843f6b9fc (patch) | |
| tree | 78f5de39afdc8214e46835bee111eb6c44bbcb86 /include/linux | |
| parent | e7f900845581666f38aedca7505b3f43aa69139e (diff) | |
| parent | d3150cd7f059bab3ae3bc809ec6327b9c0110b9d (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/atalk.h | 14 | ||||
| -rw-r--r-- | include/linux/netdevice.h | 1 | ||||
| -rw-r--r-- | include/linux/sctp.h | 17 |
3 files changed, 23 insertions, 9 deletions
diff --git a/include/linux/atalk.h b/include/linux/atalk.h index e26dc1db8a41..477169eb5b28 100644 --- a/include/linux/atalk.h +++ b/include/linux/atalk.h @@ -198,5 +198,19 @@ extern void aarp_cleanup_module(void); #define at_sk(__sk) ((struct atalk_sock *)(__sk)->protinfo) +extern struct sock *atalk_sockets; +extern spinlock_t atalk_sockets_lock; + +extern struct atalk_route *atalk_routes; +extern rwlock_t atalk_routes_lock; + +extern struct atalk_iface *atalk_interfaces; +extern spinlock_t atalk_interfaces_lock; + +extern struct atalk_route atrtr_default; + +extern int atalk_proc_init(void); +extern void atalk_proc_exit(void); + #endif /* __KERNEL__ */ #endif /* __LINUX_ATALK_H__ */ diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 93b4d5f1e64d..f2c8daf526aa 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -587,7 +587,6 @@ static inline void dev_kfree_skb_any(struct sk_buff *skb) dev_kfree_skb(skb); } -extern void net_call_rx_atomic(void (*fn)(void)); #define HAVE_NETIF_RX 1 extern int netif_rx(struct sk_buff *skb); #define HAVE_NETIF_RECEIVE_SKB 1 diff --git a/include/linux/sctp.h b/include/linux/sctp.h index 77502f62b660..1d54c9488601 100644 --- a/include/linux/sctp.h +++ b/include/linux/sctp.h @@ -155,15 +155,15 @@ typedef struct sctp_paramhdr { typedef enum { /* RFC 2960 Section 3.3.5 */ - SCTP_PARAM_HEATBEAT_INFO = __constant_htons(1), + SCTP_PARAM_HEARTBEAT_INFO = __constant_htons(1), /* RFC 2960 Section 3.3.2.1 */ - SCTP_PARAM_IPV4_ADDRESS = __constant_htons(5), - SCTP_PARAM_IPV6_ADDRESS = __constant_htons(6), - SCTP_PARAM_STATE_COOKIE = __constant_htons(7), - SCTP_PARAM_UNRECOGNIZED_PARAMETERS = __constant_htons(8), - SCTP_PARAM_COOKIE_PRESERVATIVE = __constant_htons(9), - SCTP_PARAM_HOST_NAME_ADDRESS = __constant_htons(11), - SCTP_PARAM_SUPPORTED_ADDRESS_TYPES = __constant_htons(12), + SCTP_PARAM_IPV4_ADDRESS = __constant_htons(5), + SCTP_PARAM_IPV6_ADDRESS = __constant_htons(6), + SCTP_PARAM_STATE_COOKIE = __constant_htons(7), + SCTP_PARAM_UNRECOGNIZED_PARAMETERS = __constant_htons(8), + SCTP_PARAM_COOKIE_PRESERVATIVE = __constant_htons(9), + SCTP_PARAM_HOST_NAME_ADDRESS = __constant_htons(11), + SCTP_PARAM_SUPPORTED_ADDRESS_TYPES = __constant_htons(12), SCTP_PARAM_ECN_CAPABLE = __constant_htons(0x8000), /* Add-IP Extension. Section 3.2 */ @@ -190,6 +190,7 @@ typedef enum { SCTP_PARAM_ACTION_SKIP_ERR = __constant_htons(0xc000), } sctp_param_action_t; +enum { SCTP_PARAM_ACTION_MASK = __constant_htons(0xc000), }; /* RFC 2960 Section 3.3.1 Payload Data (DATA) (0) */ |