diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-11-01 18:01:44 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-12-15 14:28:48 +0100 |
commit | 9261e7447ea7b8d33b70ff6ea008f2041a88e255 (patch) | |
tree | c9af04326ac9953a33fc8fd3e852c11fc1eb4df3 /target/linux/generic/backport-4.19/349-v4.18-netfilter-nf_flow_table-clean-up-flow_offload_alloc.patch | |
parent | 52a82ce3dd901a1536c7d7d9d963e9c2d761c816 (diff) | |
download | upstream-9261e7447ea7b8d33b70ff6ea008f2041a88e255.tar.gz upstream-9261e7447ea7b8d33b70ff6ea008f2041a88e255.tar.bz2 upstream-9261e7447ea7b8d33b70ff6ea008f2041a88e255.zip |
kernel: Make the patches apply on top of 4.19
This makes the patches which were just copied in the previous commit
apply on top of kernel 4.19.
The patches in the backports-4.19 folder were checked if they are really
in kernel 4.19 based on the title and only removed if they were found in
the upstream kernel.
The following additional patches form the pending folder went into
upstream Linux 4.19:
pending-4.19/171-usb-dwc2-Fix-inefficient-copy-of-unaligned-buffers.patch
pending-4.19/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch
pending-4.19/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch
pending-4.19/479-mtd-spi-nor-add-eon-en25qh32.patch
pending-4.19/950-tty-serial-exar-generalize-rs485-setup.patch
pending-4.19/340-MIPS-mm-remove-mips_dma_mapping_error.patch
Bigger changes were introduced to the m25p80 spi nor driver, as far as I
saw it in the new code, it now has the functionality provided in this
patch:
pending-4.19/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch
Part of this patch went upstream independent of OpenWrt:
hack-4.19/220-gc_sections.patch
This patch was reworked to match the changes done upstream.
The MIPS DMA API changed a lot, this patch was rewritten to match the
new DMA handling:
pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch
I did bigger manual changes to the following patches and I am not 100% sure if they are all correct:
pending-4.19/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch
pending-4.19/411-mtd-partial_eraseblock_write.patch
pending-4.19/600-netfilter_conntrack_flush.patch
pending-4.19/611-netfilter_match_bypass_default_table.patch
pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
hack-4.19/211-host_tools_portability.patch
hack-4.19/221-module_exports.patch
hack-4.19/321-powerpc_crtsavres_prereq.patch
hack-4.19/902-debloat_proc.patch
This is based on patchset from Marko Ratkaj <marko.ratkaj@sartura.hr>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-4.19/349-v4.18-netfilter-nf_flow_table-clean-up-flow_offload_alloc.patch')
-rw-r--r-- | target/linux/generic/backport-4.19/349-v4.18-netfilter-nf_flow_table-clean-up-flow_offload_alloc.patch | 118 |
1 files changed, 0 insertions, 118 deletions
diff --git a/target/linux/generic/backport-4.19/349-v4.18-netfilter-nf_flow_table-clean-up-flow_offload_alloc.patch b/target/linux/generic/backport-4.19/349-v4.18-netfilter-nf_flow_table-clean-up-flow_offload_alloc.patch deleted file mode 100644 index 39ea757f04..0000000000 --- a/target/linux/generic/backport-4.19/349-v4.18-netfilter-nf_flow_table-clean-up-flow_offload_alloc.patch +++ /dev/null @@ -1,118 +0,0 @@ -From: Felix Fietkau <nbd@nbd.name> -Date: Fri, 16 Feb 2018 09:42:32 +0100 -Subject: [PATCH] netfilter: nf_flow_table: clean up flow_offload_alloc - -Reduce code duplication and make it much easier to read - -Signed-off-by: Felix Fietkau <nbd@nbd.name> ---- - ---- a/net/netfilter/nf_flow_table.c -+++ b/net/netfilter/nf_flow_table.c -@@ -16,6 +16,38 @@ struct flow_offload_entry { - struct rcu_head rcu_head; - }; - -+static void -+flow_offload_fill_dir(struct flow_offload *flow, struct nf_conn *ct, -+ struct nf_flow_route *route, -+ enum flow_offload_tuple_dir dir) -+{ -+ struct flow_offload_tuple *ft = &flow->tuplehash[dir].tuple; -+ struct nf_conntrack_tuple *ctt = &ct->tuplehash[dir].tuple; -+ -+ ft->dir = dir; -+ -+ switch (ctt->src.l3num) { -+ case NFPROTO_IPV4: -+ ft->src_v4 = ctt->src.u3.in; -+ ft->dst_v4 = ctt->dst.u3.in; -+ break; -+ case NFPROTO_IPV6: -+ ft->src_v6 = ctt->src.u3.in6; -+ ft->dst_v6 = ctt->dst.u3.in6; -+ break; -+ } -+ -+ ft->l3proto = ctt->src.l3num; -+ ft->l4proto = ctt->dst.protonum; -+ ft->src_port = ctt->src.u.tcp.port; -+ ft->dst_port = ctt->dst.u.tcp.port; -+ -+ ft->iifidx = route->tuple[dir].ifindex; -+ ft->oifidx = route->tuple[!dir].ifindex; -+ -+ ft->dst_cache = route->tuple[dir].dst; -+} -+ - struct flow_offload * - flow_offload_alloc(struct nf_conn *ct, struct nf_flow_route *route) - { -@@ -40,65 +72,8 @@ flow_offload_alloc(struct nf_conn *ct, s - - entry->ct = ct; - -- switch (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num) { -- case NFPROTO_IPV4: -- flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_v4 = -- ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.in; -- flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.dst_v4 = -- ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.in; -- flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.src_v4 = -- ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.in; -- flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dst_v4 = -- ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.in; -- break; -- case NFPROTO_IPV6: -- flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_v6 = -- ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.in6; -- flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.dst_v6 = -- ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.in6; -- flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.src_v6 = -- ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.in6; -- flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dst_v6 = -- ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.in6; -- break; -- } -- -- flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.l3proto = -- ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num; -- flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.l4proto = -- ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum; -- flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.l3proto = -- ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num; -- flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.l4proto = -- ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum; -- -- flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.dst_cache = -- route->tuple[FLOW_OFFLOAD_DIR_ORIGINAL].dst; -- flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dst_cache = -- route->tuple[FLOW_OFFLOAD_DIR_REPLY].dst; -- -- flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_port = -- ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.tcp.port; -- flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.dst_port = -- ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u.tcp.port; -- flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.src_port = -- ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u.tcp.port; -- flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dst_port = -- ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u.tcp.port; -- -- flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.dir = -- FLOW_OFFLOAD_DIR_ORIGINAL; -- flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dir = -- FLOW_OFFLOAD_DIR_REPLY; -- -- flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.iifidx = -- route->tuple[FLOW_OFFLOAD_DIR_ORIGINAL].ifindex; -- flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.oifidx = -- route->tuple[FLOW_OFFLOAD_DIR_REPLY].ifindex; -- flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.iifidx = -- route->tuple[FLOW_OFFLOAD_DIR_REPLY].ifindex; -- flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.oifidx = -- route->tuple[FLOW_OFFLOAD_DIR_ORIGINAL].ifindex; -+ flow_offload_fill_dir(flow, ct, route, FLOW_OFFLOAD_DIR_ORIGINAL); -+ flow_offload_fill_dir(flow, ct, route, FLOW_OFFLOAD_DIR_REPLY); - - if (ct->status & IPS_SRC_NAT) - flow->flags |= FLOW_OFFLOAD_SNAT; |