diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-14 05:30:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-14 05:30:23 -0400 |
| commit | df39e8ba56a788733d369068c7319e04b1da3cd5 (patch) | |
| tree | 1e9be853bdb455e341cdbf957656f342cfa2eb9e /net/dccp/proto.c | |
| parent | f5572855ec492334d8c3ec0e0e86c31865d5cf07 (diff) | |
| parent | 159d83363b629c91d020734207c1bc788b96af5a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ehea/ehea_main.c
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/rt2x00/rt61pci.c
net/ipv4/inet_timewait_sock.c
net/ipv6/raw.c
net/mac80211/ieee80211_sta.c
Diffstat (limited to 'net/dccp/proto.c')
| -rw-r--r-- | net/dccp/proto.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index d534cdf9603b..a4c1b36f4bc7 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c | |||
| @@ -1038,6 +1038,9 @@ static int __init dccp_init(void) | |||
| 1038 | int ehash_order, bhash_order, i; | 1038 | int ehash_order, bhash_order, i; |
| 1039 | int rc = -ENOBUFS; | 1039 | int rc = -ENOBUFS; |
| 1040 | 1040 | ||
| 1041 | BUILD_BUG_ON(sizeof(struct dccp_skb_cb) > | ||
| 1042 | FIELD_SIZEOF(struct sk_buff, cb)); | ||
| 1043 | |||
| 1041 | dccp_hashinfo.bind_bucket_cachep = | 1044 | dccp_hashinfo.bind_bucket_cachep = |
| 1042 | kmem_cache_create("dccp_bind_bucket", | 1045 | kmem_cache_create("dccp_bind_bucket", |
| 1043 | sizeof(struct inet_bind_bucket), 0, | 1046 | sizeof(struct inet_bind_bucket), 0, |