diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-12-11 17:12:17 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 17:12:17 -0800 |
| commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
| tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /include/net/tcp.h | |
| parent | net: Handle NETREG_UNINITIALIZED devices correctly (diff) | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq (diff) | |
| download | linux-dev-501706565b2d4d2d40d0d301d5411ede099b8a6f.tar.xz linux-dev-501706565b2d4d2d40d0d301d5411ede099b8a6f.zip | |
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 #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; |