A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-26 06:33:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git

Browse source
This commit is contained in:
Linus Torvalds 2005-05-05 16:22:23 -07:00
commit fd4e5f29f7
9 changed files with 77 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/if_ltalk.h
View file

@ -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

2
include/net/sock.h
View file

@ -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;