diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
| commit | c4de673b775e4db48cd2db6277e0c6714332ca0c (patch) | |
| tree | 84f9e4728e6ccf257236d2ba063b6e784ec8b65d /include/linux/ipc_namespace.h | |
| parent | bafdc614a1f4f8be8cde41b8ab10ac17e67c1837 (diff) | |
| parent | 55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'include/linux/ipc_namespace.h')
| -rw-r--r-- | include/linux/ipc_namespace.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h index 19c19a5eee29..f6c82de12541 100644 --- a/include/linux/ipc_namespace.h +++ b/include/linux/ipc_namespace.h | |||
| @@ -34,9 +34,9 @@ struct ipc_namespace { | |||
| 34 | int sem_ctls[4]; | 34 | int sem_ctls[4]; |
| 35 | int used_sems; | 35 | int used_sems; |
| 36 | 36 | ||
| 37 | int msg_ctlmax; | 37 | unsigned int msg_ctlmax; |
| 38 | int msg_ctlmnb; | 38 | unsigned int msg_ctlmnb; |
| 39 | int msg_ctlmni; | 39 | unsigned int msg_ctlmni; |
| 40 | atomic_t msg_bytes; | 40 | atomic_t msg_bytes; |
| 41 | atomic_t msg_hdrs; | 41 | atomic_t msg_hdrs; |
| 42 | int auto_msgmni; | 42 | int auto_msgmni; |