Merge "clatd: use struct instead of direct u8[] for buffer"