diff options
| author |   Jeff Garzik <jgarzik@pobox.com> | 2005-08-14 23:10:00 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-14 23:10:00 -0400 |
| commit | 4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 (patch) | |
| tree | 07aea7539f78f221c6fc535a94a07befa2afdb63 /include/linux/zlib.h | |
| parent | [PATCH] ieee80211: Fix frame control pver mask (diff) | |
| parent | Revert PCIBIOS_MIN_IO changes for 2.6.13 (diff) | |
| download | linux-dev-4c0e176dd5e4c44dd60f398518f75eedbe1a65f3.tar.xz linux-dev-4c0e176dd5e4c44dd60f398518f75eedbe1a65f3.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/linux/zlib.h')
| -rw-r--r-- | include/linux/zlib.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/zlib.h b/include/linux/zlib.h index 850076ea14d3..74f7b78c22d2 100644 --- a/include/linux/zlib.h +++ b/include/linux/zlib.h @@ -506,6 +506,11 @@ extern int zlib_deflateReset (z_streamp strm); stream state was inconsistent (such as zalloc or state being NULL). */ +static inline unsigned long deflateBound(unsigned long s) +{ + return s + ((s + 7) >> 3) + ((s + 63) >> 6) + 11; +} + extern int zlib_deflateParams (z_streamp strm, int level, int strategy); /* Dynamically update the compression level and compression strategy. The |