diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 16:22:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 16:22:23 -0700 |
| commit | fd4e5f29f7354c3e3edaa03d37a7bf83b0cbae36 (patch) | |
| tree | dd776442b62b9f24928672c886ebf23efb1ace56 /include | |
| parent | 4adb18173aba217a7ce7f261427914d1350c4e18 (diff) | |
| parent | b6d31e80f0d6a722bf85b3a7090df473fc545980 (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_ltalk.h | 2 | ||||
| -rw-r--r-- | include/net/sock.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/if_ltalk.h b/include/linux/if_ltalk.h index e75e832b7ff..76525760ba4 100644 --- a/include/linux/if_ltalk.h +++ b/include/linux/if_ltalk.h @@ -6,7 +6,7 @@ #define LTALK_ALEN 1 #ifdef __KERNEL__ -extern void ltalk_setup(struct net_device *); +extern struct net_device *alloc_ltalkdev(int sizeof_priv); #endif #endif diff --git a/include/net/sock.h b/include/net/sock.h index cc4c9190b7f..77f02f86346 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -141,6 +141,7 @@ struct sock_common { * @sk_callback_lock: used with the callbacks in the end of this struct * @sk_error_queue: rarely used * @sk_prot: protocol handlers inside a network family + * @sk_prot_creator: sk_prot of original sock creator (see ipv6_setsockopt, IPV6_ADDRFORM for instance) * @sk_err: last error * @sk_err_soft: errors that don't cause failure but are the cause of a persistent failure not just 'timed out' * @sk_ack_backlog: current listen backlog @@ -218,6 +219,7 @@ struct sock { } sk_backlog; struct sk_buff_head sk_error_queue; struct proto *sk_prot; + struct proto *sk_prot_creator; rwlock_t sk_callback_lock; int sk_err, sk_err_soft; |