From: David S. Miller Date: Sat, 7 Jul 2018 01:58:50 +0000 (+0900) Subject: Merge branch 'sock-cookie-initializers' X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9ebcb397aaaf6a18d35db0168375e183e9170f53;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'sock-cookie-initializers' Willem de Bruijn says: ==================== sock cookie initializers Recent UDP GSO and SO_TXTIME features added new fields to cookie structs. When adding a field, all sites where a struct is initialized have to be updated, which is a lot of boilerplate. Alternatively, a field can be initialized selectively, but this is fragile. I introduced a bug in udp gso where an uninitialized field was read. See also fix commit ("9887cba19978 ip: limit use of gso_size to udp"). Introduce initializers for structs ipcm(6)_cookie and sockc_cookie. patch 1..3 do exactly this. patch 4..5 make ipv4 and ipv6 handle cookies the same way and remove some boilerplate in doing so. patch 6 removes the udp gso branch that needed the above fix ==================== Signed-off-by: David S. Miller --- 9ebcb397aaaf6a18d35db0168375e183e9170f53