summaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
authorPavel Emelyanov2007-12-11 11:12:04 +0100
committerDavid S. Miller2008-01-28 23:57:07 +0100
commit1f9e636ea21bd648a5cbd2f744a1d39a5e183b20 (patch)
tree33d4c23d9c2a64ed042151f51962754af3359692 /net/ipv4/tcp.c
parent[NETLINK]: kzalloc() conversion (diff)
downloadkernel-qcow2-linux-1f9e636ea21bd648a5cbd2f744a1d39a5e183b20.tar.gz
kernel-qcow2-linux-1f9e636ea21bd648a5cbd2f744a1d39a5e183b20.tar.xz
kernel-qcow2-linux-1f9e636ea21bd648a5cbd2f744a1d39a5e183b20.zip
[TCP]: Use BUILD_BUG_ON for tcp_skb_cb size checking
The sizeof(struct tcp_skb_cb) should not be less than the sizeof(skb->cb). This is checked in net/ipv4/tcp.c, but this check can be made more gracefully. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r--net/ipv4/tcp.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index eb77088f3054..fdaf965a6794 100644
--- a/net/ipv4/tcp.c
+++ b/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",