openwrt/upstream - upstream openwrt

	Commit message (Collapse)	Author	Age	Files	Lines
*	kernel: fix xt_connmark.h	Martin Schiller	2020-02-22	1	-2/+2
\| \| \| \| \| \| \| \| \|	Commit a1cfe0dcbb24 (kernel: connmark set-dscpmark follow upstreamimg attempt") broke the usage of xt_connmark.h in user-space (e.g. strongswan), because the BIT() macro is unknown there. Fixes: a1cfe0dcbb24 (kernel: connmark set-dscpmark follow upstreamimg attempt") Signed-off-by: Martin Schiller <ms@dev.tdt.de>
*	kernel: connmark set-dscpmark follow upstreamimg attempt	Kevin Darbyshire-Bryant	2020-01-31	1	-0/+212
	I'm having another attempt at trying to getting the 'store dscp into conntrack connmark' functionality into upstream kernel, since the restore function (act_ctinfo) has been accepted. The syntax has changed from 'savedscp' to 'set-dscpmark' since that conforms more closely with existing functionality. 4.14 backport is more of a hack since the structure versioning mechanism isn't in place. Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>