diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 20:12:17 -0500 |
| commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
| tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /include/net/tcp.h | |
| parent | e93737b0f0159a61772894943199fd3b6f315641 (diff) | |
| parent | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
Diffstat (limited to 'include/net/tcp.h')
| -rw-r--r-- | include/net/tcp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 0248c181a92c..1b6f7d348cee 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
| @@ -1261,7 +1261,6 @@ static inline struct sk_buff *tcp_write_queue_prev(struct sock *sk, struct sk_bu | |||
| 1261 | #define tcp_for_write_queue_from_safe(skb, tmp, sk) \ | 1261 | #define tcp_for_write_queue_from_safe(skb, tmp, sk) \ |
| 1262 | skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp) | 1262 | skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp) |
| 1263 | 1263 | ||
| 1264 | |||
| 1265 | static inline struct sk_buff *tcp_send_head(struct sock *sk) | 1264 | static inline struct sk_buff *tcp_send_head(struct sock *sk) |
| 1266 | { | 1265 | { |
| 1267 | return sk->sk_send_head; | 1266 | return sk->sk_send_head; |