From: David S. Miller Date: Sun, 29 Oct 2017 02:18:49 +0000 (+0900) Subject: Merge branch 'sockmap-fixes' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=151516fab4e82ab5da35fd14c972efc90a1c4aa4;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'sockmap-fixes' John Fastabend says: ==================== net: sockmap fixes Last two fixes (as far as I know) for sockmap code this round. First, we are using the qdisc cb structure when making the data end calculation. This is really just wrong so, store it with the other metadata in the correct tcp_skb_cb sturct to avoid breaking things. Next, with recent work to attach multiple programs to a cgroup a specific enumeration of return codes was agreed upon. However, I wrote the sk_skb program types before seeing this work and used a different convention. Patch 2 in the series aligns the return codes to avoid breaking with this infrastructure and also aligns with other programming conventions to avoid being the odd duck out forcing programs to remember SK_SKB programs are different. Pusing to net because its a user visible change. With this SK_SKB program return codes are the same as other cgroup program types. ==================== Signed-off-by: David S. Miller --- 151516fab4e82ab5da35fd14c972efc90a1c4aa4