diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-12-01 07:13:56 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-12-01 07:13:56 -0500 |
| commit | 307991055b0ce65d53dc1eb501c456c10eb36360 (patch) | |
| tree | 71bb9263dc71344e5d7b97ca6d5cf223f1f1a856 /include/net/udp.h | |
| parent | 1198c6d45a1ef5f4f7fdfbf33ef7d270493ec575 (diff) | |
| parent | 9b4320b77bab4031649c484da1c595f39c2e43cd (diff) | |
Merge branch 'kconfig_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next into kbuild/rc-fixes
Diffstat (limited to 'include/net/udp.h')
| -rw-r--r-- | include/net/udp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/udp.h b/include/net/udp.h index 200b82848c9a..bb967dd59bf7 100644 --- a/include/net/udp.h +++ b/include/net/udp.h | |||
| @@ -105,10 +105,10 @@ static inline struct udp_hslot *udp_hashslot2(struct udp_table *table, | |||
| 105 | 105 | ||
| 106 | extern struct proto udp_prot; | 106 | extern struct proto udp_prot; |
| 107 | 107 | ||
| 108 | extern atomic_t udp_memory_allocated; | 108 | extern atomic_long_t udp_memory_allocated; |
| 109 | 109 | ||
| 110 | /* sysctl variables for udp */ | 110 | /* sysctl variables for udp */ |
| 111 | extern int sysctl_udp_mem[3]; | 111 | extern long sysctl_udp_mem[3]; |
| 112 | extern int sysctl_udp_rmem_min; | 112 | extern int sysctl_udp_rmem_min; |
| 113 | extern int sysctl_udp_wmem_min; | 113 | extern int sysctl_udp_wmem_min; |
| 114 | 114 | ||