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/msg.h | |
| parent | bafdc614a1f4f8be8cde41b8ab10ac17e67c1837 (diff) | |
| parent | 55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'include/linux/msg.h')
| -rw-r--r-- | include/linux/msg.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/msg.h b/include/linux/msg.h index 391af8d11cce..e21f9d44307f 100644 --- a/include/linux/msg.h +++ b/include/linux/msg.h | |||
| @@ -6,9 +6,9 @@ | |||
| 6 | 6 | ||
| 7 | /* one msg_msg structure for each message */ | 7 | /* one msg_msg structure for each message */ |
| 8 | struct msg_msg { | 8 | struct msg_msg { |
| 9 | struct list_head m_list; | 9 | struct list_head m_list; |
| 10 | long m_type; | 10 | long m_type; |
| 11 | int m_ts; /* message text size */ | 11 | size_t m_ts; /* message text size */ |
| 12 | struct msg_msgseg* next; | 12 | struct msg_msgseg* next; |
| 13 | void *security; | 13 | void *security; |
| 14 | /* the actual message follows immediately */ | 14 | /* the actual message follows immediately */ |