ukui/kernel
0
0
Fork 0
mirror of https://github.com/ukui/kernel.git synced 2026-03-09 10:07:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Browse Source 
Conflicts:
	include/net/tcp.h
This commit is contained in:
David S. Miller
2009-12-11 17:12:17 -08:00
parent e93737b0f0 2fe77b81c7
commit 501706565b
3064 changed files with 331360 additions and 222640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/sctp/structs.h
View File

@@ -989,7 +989,7 @@ struct sctp_transport {
int init_sent_count;
/* state : The current state of this destination,
* : i.e. SCTP_ACTIVE, SCTP_INACTIVE, SCTP_UNKOWN.
* : i.e. SCTP_ACTIVE, SCTP_INACTIVE, SCTP_UNKNOWN.
*/
int state;

1
include/net/tcp.h
View File

@@ -1261,7 +1261,6 @@ static inline struct sk_buff *tcp_write_queue_prev(struct sock *sk, struct sk_bu
#define tcp_for_write_queue_from_safe(skb, tmp, sk) \
skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp)
static inline struct sk_buff *tcp_send_head(struct sock *sk)
{
return sk->sk_send_head;

2
include/net/wimax.h
View File

@@ -79,7 +79,7 @@
* drivers have to only report state changes due to external
* conditions.
*
* All API operations are 'atomic', serialized thorough a mutex in the
* All API operations are 'atomic', serialized through a mutex in the
* `struct wimax_dev`.
*
* EXPORTING TO USER SPACE THROUGH GENERIC NETLINK