From 5eeefe2d25616838dae95eeb21b793e3f13f87c7 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Tue, 11 Dec 2007 02:12:04 -0800 Subject: [PATCH] --- yaml --- r: 78387 b: refs/heads/master c: 1f9e636ea21bd648a5cbd2f744a1d39a5e183b20 h: refs/heads/master i: 78385: cc30bf7b48dec704f405cc155698c1a71d2026a1 78383: f0d870eb1da31611477c1ec1ff8b2b075398b996 v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4b3ede2c6cb6..7626a7f5b17a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea72912c888661d1a847f1b1450643d4114097cf +refs/heads/master: 1f9e636ea21bd648a5cbd2f744a1d39a5e183b20 diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c index eb77088f3054..fdaf965a6794 100644 --- a/trunk/net/ipv4/tcp.c +++ b/trunk/net/ipv4/tcp.c @@ -2563,7 +2563,6 @@ void tcp_done(struct sock *sk) } EXPORT_SYMBOL_GPL(tcp_done); -extern void __skb_cb_too_small_for_tcp(int, int); extern struct tcp_congestion_ops tcp_reno; static __initdata unsigned long thash_entries; @@ -2582,9 +2581,7 @@ void __init tcp_init(void) unsigned long limit; int order, i, max_share; - if (sizeof(struct tcp_skb_cb) > sizeof(skb->cb)) - __skb_cb_too_small_for_tcp(sizeof(struct tcp_skb_cb), - sizeof(skb->cb)); + BUILD_BUG_ON(sizeof(struct tcp_skb_cb) > sizeof(skb->cb)); tcp_hashinfo.bind_bucket_cachep = kmem_cache_create("tcp_bind_bucket",