kernel: remove support for kernel 4.14
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>
Fri, 7 Aug 2020 12:29:11 +0000 (14:29 +0200)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Wed, 2 Sep 2020 14:29:23 +0000 (16:29 +0200)
No target uses kernel 4.14 anymore.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
270 files changed:
include/kernel-version.mk
target/linux/generic/backport-4.14/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch [deleted file]
target/linux/generic/backport-4.14/011-kbuild-export-SUBARCH.patch [deleted file]
target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch [deleted file]
target/linux/generic/backport-4.14/013-disable-Wattribute-alias-warning-for-SYSCALL_DEFINEx.patch [deleted file]
target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch [deleted file]
target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch [deleted file]
target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch [deleted file]
target/linux/generic/backport-4.14/030-v4.17-0001-usb-dwc2-add-support-for-host-mode-external-vbus-sup.patch [deleted file]
target/linux/generic/backport-4.14/030-v4.17-0002-usb-dwc2-dwc2_vbus_supply_init-fix-error-check.patch [deleted file]
target/linux/generic/backport-4.14/040-v4.17-0001-mtd-move-code-adding-master-MTD-out-of-mtd_add_devic.patch [deleted file]
target/linux/generic/backport-4.14/040-v4.17-0002-mtd-get-rid-of-the-mtd_add_device_partitions.patch [deleted file]
target/linux/generic/backport-4.14/041-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch [deleted file]
target/linux/generic/backport-4.14/041-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch [deleted file]
target/linux/generic/backport-4.14/041-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch [deleted file]
target/linux/generic/backport-4.14/042-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch [deleted file]
target/linux/generic/backport-4.14/043-v4.18-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch [deleted file]
target/linux/generic/backport-4.14/044-v4.18-mtd-bcm47xxpart-add-of_match_table-with-a-new-DT-bin.patch [deleted file]
target/linux/generic/backport-4.14/045-v4.19-mtd-parsers-trx-add-of_match_table-with-the-new-DT-b.patch [deleted file]
target/linux/generic/backport-4.14/046-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch [deleted file]
target/linux/generic/backport-4.14/047-v4.21-mtd-keep-original-flags-for-every-struct-mtd_info.patch [deleted file]
target/linux/generic/backport-4.14/048-v4.21-mtd-improve-calculating-partition-boundaries-when-ch.patch [deleted file]
target/linux/generic/backport-4.14/050-v4.19-f2fs-skip-verifying-block-address-non-regular-inode.patch [deleted file]
target/linux/generic/backport-4.14/071-v4.15-0001-net-bgmac-enable-master-mode-for-BCM54210E-and-B5021.patch [deleted file]
target/linux/generic/backport-4.14/076-v4.15-0001-net-phy-broadcom-support-new-device-flag-for-setting.patch [deleted file]
target/linux/generic/backport-4.14/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch [deleted file]
target/linux/generic/backport-4.14/080-v5.1-0002-bcma-use-dev_-printing-functions.patch [deleted file]
target/linux/generic/backport-4.14/085-v4.16-0001-i2c-gpio-Enable-working-over-slow-can_sleep-GPIOs.patch [deleted file]
target/linux/generic/backport-4.14/090-net-bridge-add-support-for-port-isolation.patch [deleted file]
target/linux/generic/backport-4.14/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch [deleted file]
target/linux/generic/backport-4.14/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch [deleted file]
target/linux/generic/backport-4.14/183-net-qmi_wwan-add-Wistron-Neweb-D19Q1.patch [deleted file]
target/linux/generic/backport-4.14/270-batman-adv-Let-packet.h-include-its-headers-directly.patch [deleted file]
target/linux/generic/backport-4.14/271-batman-adv-Remove-usage-of-BIT-x-in-packet.h.patch [deleted file]
target/linux/generic/backport-4.14/272-batman-adv-Remove-kernel-fixed-width-types-in-packet.patch [deleted file]
target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch [deleted file]
target/linux/generic/backport-4.14/274-flow_dissector-Parse-batman-adv-unicast-headers.patch [deleted file]
target/linux/generic/backport-4.14/289-v4.16-netfilter-add-defines-for-arp-decnet-max-hooks.patch [deleted file]
target/linux/generic/backport-4.14/290-v4.16-netfilter-core-make-nf_unregister_net_hooks-simple-w.patch [deleted file]
target/linux/generic/backport-4.14/291-v4.16-netfilter-core-remove-synchronize_net-call-if-nfqueu.patch [deleted file]
target/linux/generic/backport-4.14/292-v4.16-netfilter-core-free-hooks-with-call_rcu.patch [deleted file]
target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch [deleted file]
target/linux/generic/backport-4.14/294-v4.16-netfilter-reduce-hook-array-sizes-to-what-is-needed.patch [deleted file]
target/linux/generic/backport-4.14/295-v4.16-netfilter-don-t-allocate-space-for-decnet-hooks-unle.patch [deleted file]
target/linux/generic/backport-4.14/296-v4.16-netfilter-don-t-allocate-space-for-arp-bridge-hooks-.patch [deleted file]
target/linux/generic/backport-4.14/297-v4.16-netfilter-core-pass-hook-number-family-and-device-to.patch [deleted file]
target/linux/generic/backport-4.14/298-v4.16-netfilter-core-add-nf_remove_net_hook.patch [deleted file]
target/linux/generic/backport-4.14/298-v4.16-netfilter-core-pass-family-as-parameter-to-nf_remove.patch [deleted file]
target/linux/generic/backport-4.14/299-v4.16-netfilter-core-support-for-NFPROTO_INET-hook-registr.patch [deleted file]
target/linux/generic/backport-4.14/300-v4.16-netfilter-nf_tables-explicit-nft_set_pktinfo-call-fr.patch [deleted file]
target/linux/generic/backport-4.14/301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch [deleted file]
target/linux/generic/backport-4.14/302-v4.16-netfilter-nf_tables_inet-don-t-use-multihook-infrast.patch [deleted file]
target/linux/generic/backport-4.14/303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch [deleted file]
target/linux/generic/backport-4.14/304-v4.16-netfilter-move-checksum-indirection-to-struct-nf_ipv.patch [deleted file]
target/linux/generic/backport-4.14/305-v4.16-netfilter-move-checksum_partial-indirection-to-struc.patch [deleted file]
target/linux/generic/backport-4.14/306-v4.16-netfilter-remove-saveroute-indirection-in-struct-nf_.patch [deleted file]
target/linux/generic/backport-4.14/307-v4.16-netfilter-move-route-indirection-to-struct-nf_ipv6_o.patch [deleted file]
target/linux/generic/backport-4.14/308-v4.16-netfilter-move-reroute-indirection-to-struct-nf_ipv6.patch [deleted file]
target/linux/generic/backport-4.14/309-v4.16-netfilter-remove-route_key_size-field-in-struct-nf_a.patch [deleted file]
target/linux/generic/backport-4.14/310-v4.16-netfilter-remove-struct-nf_afinfo-and-its-helper-fun.patch [deleted file]
target/linux/generic/backport-4.14/311-v4.16-netfilter-nf_tables_arp-don-t-set-forward-chain.patch [deleted file]
target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch [deleted file]
target/linux/generic/backport-4.14/313-v4.16-netfilter-remove-defensive-check-on-malformed-packet.patch [deleted file]
target/linux/generic/backport-4.14/314-v4.16-netfilter-meta-secpath-support.patch [deleted file]
target/linux/generic/backport-4.14/315-v4.15-netfilter-conntrack-move-nf_ct_netns_-get-put-to-cor.patch [deleted file]
target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch [deleted file]
target/linux/generic/backport-4.14/321-v4.16-netfilter-nf_tables-add-flow-table-netlink-frontend.patch [deleted file]
target/linux/generic/backport-4.14/322-v4.16-netfilter-add-generic-flow-table-infrastructure.patch [deleted file]
target/linux/generic/backport-4.14/323-v4.16-netfilter-flow-table-support-for-IPv4.patch [deleted file]
target/linux/generic/backport-4.14/324-v4.16-netfilter-flow-table-support-for-IPv6.patch [deleted file]
target/linux/generic/backport-4.14/325-v4.16-netfilter-flow-table-support-for-the-mixed-IPv4-IPv6.patch [deleted file]
target/linux/generic/backport-4.14/326-v4.16-netfilter-nf_tables-flow-offload-expression.patch [deleted file]
target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch [deleted file]
target/linux/generic/backport-4.14/328-v4.16-netfilter-nf_tables-fix-a-typo-in-nf_tables_getflowt.patch [deleted file]
target/linux/generic/backport-4.14/329-v4.16-netfilter-improve-flow-table-Kconfig-dependencies.patch [deleted file]
target/linux/generic/backport-4.14/330-v4.16-netfilter-nf_tables-remove-flag-field-from-struct-nf.patch [deleted file]
target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch [deleted file]
target/linux/generic/backport-4.14/332-v4.16-netfilter-nf_tables-remove-struct-nft_af_info-parame.patch [deleted file]
target/linux/generic/backport-4.14/334-v4.15-netfilter-nf_tables-fix-potential-NULL-ptr-deref-in-.patch [deleted file]
target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch [deleted file]
target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch [deleted file]
target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch [deleted file]
target/linux/generic/backport-4.14/338-v4.16-netfilter-nf_tables-get-rid-of-struct-nft_af_info-ab.patch [deleted file]
target/linux/generic/backport-4.14/339-v4.16-netfilter-nft_flow_offload-wait-for-garbage-collecto.patch [deleted file]
target/linux/generic/backport-4.14/340-v4.16-netfilter-nft_flow_offload-no-need-to-flush-entries-.patch [deleted file]
target/linux/generic/backport-4.14/341-v4.16-netfilter-nft_flow_offload-move-flowtable-cleanup-ro.patch [deleted file]
target/linux/generic/backport-4.14/342-v4.16-netfilter-nf_tables-fix-flowtable-free.patch [deleted file]
target/linux/generic/backport-4.14/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch [deleted file]
target/linux/generic/backport-4.14/344-v4.16-netfilter-nf_tables-allocate-handle-and-delete-objec.patch [deleted file]
target/linux/generic/backport-4.14/345-v4.16-netfilter-nf_flow_offload-fix-use-after-free-and-a-r.patch [deleted file]
target/linux/generic/backport-4.14/346-v4.16-netfilter-flowtable-infrastructure-depends-on-NETFIL.patch [deleted file]
target/linux/generic/backport-4.14/347-v4.16-netfilter-remove-duplicated-include.patch [deleted file]
target/linux/generic/backport-4.14/348-v4.18-netfilter-nf_flow_table-use-IP_CT_DIR_-values-for-FL.patch [deleted file]
target/linux/generic/backport-4.14/349-v4.18-netfilter-nf_flow_table-clean-up-flow_offload_alloc.patch [deleted file]
target/linux/generic/backport-4.14/350-v4.18-ipv6-make-ip6_dst_mtu_forward-inline.patch [deleted file]
target/linux/generic/backport-4.14/351-v4.18-netfilter-nf_flow_table-cache-mtu-in-struct-flow_off.patch [deleted file]
target/linux/generic/backport-4.14/352-v4.18-netfilter-nf_flow_table-rename-nf_flow_table.c-to-nf.patch [deleted file]
target/linux/generic/backport-4.14/353-v4.18-netfilter-nf_flow_table-move-ipv4-offload-hook-code-.patch [deleted file]
target/linux/generic/backport-4.14/354-v4.18-netfilter-nf_flow_table-move-ip-header-check-out-of-.patch [deleted file]
target/linux/generic/backport-4.14/355-v4.18-netfilter-nf_flow_table-move-ipv6-offload-hook-code-.patch [deleted file]
target/linux/generic/backport-4.14/356-v4.18-netfilter-nf_flow_table-relax-mixed-ipv4-ipv6-flowta.patch [deleted file]
target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch [deleted file]
target/linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch [deleted file]
target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch [deleted file]
target/linux/generic/backport-4.14/360-v4.18-netfilter-nf_flow_table-make-flow_offload_dead-inlin.patch [deleted file]
target/linux/generic/backport-4.14/361-v4.18-netfilter-nf_flow_table-add-a-new-flow-state-for-tea.patch [deleted file]
target/linux/generic/backport-4.14/362-v4.18-netfilter-nf_flow_table-in-flow_offload_lookup-skip-.patch [deleted file]
target/linux/generic/backport-4.14/363-v4.18-netfilter-nf_flow_table-add-support-for-sending-flow.patch [deleted file]
target/linux/generic/backport-4.14/364-v4.18-netfilter-nf_flow_table-tear-down-TCP-flows-if-RST-o.patch [deleted file]
target/linux/generic/backport-4.14/365-v4.16-netfilter-nf_flow_table-fix-checksum-when-handling-D.patch [deleted file]
target/linux/generic/backport-4.14/366-netfilter-nft_flow_offload-Fix-reverse-route-lookup.patch [deleted file]
target/linux/generic/backport-4.14/367-v4.18-netfilter-nf_flow_table-add-missing-condition-for-TC.patch [deleted file]
target/linux/generic/backport-4.14/368-v4.18-netfilter-nf_flow_table-fix-offloading-connections-w.patch [deleted file]
target/linux/generic/backport-4.14/369-v4.18-netfilter-nf_flow_table-attach-dst-to-skbs.patch [deleted file]
target/linux/generic/backport-4.14/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch [deleted file]
target/linux/generic/backport-4.14/371-netfilter-nf_flow_table-fix-up-ct-state-of-flows-aft.patch [deleted file]
target/linux/generic/backport-4.14/372-netfilter-nft_flow_offload-fix-interaction-with-vrf-.patch [deleted file]
target/linux/generic/backport-4.14/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch [deleted file]
target/linux/generic/backport-4.14/400-v4.16-leds-trigger-Introduce-a-NETDEV-trigger.patch [deleted file]
target/linux/generic/backport-4.14/401-v5.2-leds-trigger-netdev-fix-refcnt-leak-on-interface-ren.patch [deleted file]
target/linux/generic/backport-4.14/402-leds-trigger-netdev-fix-handling-on-interface-rename.patch [deleted file]
target/linux/generic/backport-4.14/410-mtd-fix-calculating-partition-end-address.patch [deleted file]
target/linux/generic/backport-4.14/420-enable-CONFIG_MMC_SDHCI_IO_ACCESSORS.patch [deleted file]
target/linux/generic/backport-4.14/500-v4.20-ubifs-Fix-default-compression-selection-in-ubifs.patch [deleted file]
target/linux/generic/backport-4.14/900-v4.18-firmware-dmi-Add-access-to-the-SKU-ID-string.patch [deleted file]
target/linux/generic/backport-4.14/950-tty-serial-exar-generalize-rs485-setup.patch [deleted file]
target/linux/generic/config-4.14 [deleted file]
target/linux/generic/hack-4.14/204-module_strip.patch [deleted file]
target/linux/generic/hack-4.14/207-disable-modorder.patch [deleted file]
target/linux/generic/hack-4.14/210-darwin_scripts_include.patch [deleted file]
target/linux/generic/hack-4.14/211-host_tools_portability.patch [deleted file]
target/linux/generic/hack-4.14/212-byteshift_portability.patch [deleted file]
target/linux/generic/hack-4.14/214-spidev_h_portability.patch [deleted file]
target/linux/generic/hack-4.14/220-gc_sections.patch [deleted file]
target/linux/generic/hack-4.14/221-module_exports.patch [deleted file]
target/linux/generic/hack-4.14/230-openwrt_lzma_options.patch [deleted file]
target/linux/generic/hack-4.14/250-netfilter_depends.patch [deleted file]
target/linux/generic/hack-4.14/251-sound_kconfig.patch [deleted file]
target/linux/generic/hack-4.14/259-regmap_dynamic.patch [deleted file]
target/linux/generic/hack-4.14/260-crypto_test_dependencies.patch [deleted file]
target/linux/generic/hack-4.14/280-rfkill-stubs.patch [deleted file]
target/linux/generic/hack-4.14/300-MIPS-r4k_cache-use-more-efficient-cache-blast.patch [deleted file]
target/linux/generic/hack-4.14/301-mips_image_cmdline_hack.patch [deleted file]
target/linux/generic/hack-4.14/321-powerpc_crtsavres_prereq.patch [deleted file]
target/linux/generic/hack-4.14/400-mt29f_spinand-fix-memleak.patch [deleted file]
target/linux/generic/hack-4.14/531-debloat_lzma.patch [deleted file]
target/linux/generic/hack-4.14/640-bridge-only-accept-EAP-locally.patch [deleted file]
target/linux/generic/hack-4.14/645-netfilter-connmark-introduce-set-dscpmark.patch [deleted file]
target/linux/generic/hack-4.14/647-netfilter-flow-acct.patch [deleted file]
target/linux/generic/hack-4.14/650-netfilter-add-xt_OFFLOAD-target.patch [deleted file]
target/linux/generic/hack-4.14/651-wireless_mesh_header.patch [deleted file]
target/linux/generic/hack-4.14/660-fq_codel_defaults.patch [deleted file]
target/linux/generic/hack-4.14/661-use_fq_codel_by_default.patch [deleted file]
target/linux/generic/hack-4.14/662-remove_pfifo_fast.patch [deleted file]
target/linux/generic/hack-4.14/700-swconfig_switch_drivers.patch [deleted file]
target/linux/generic/hack-4.14/702-phy_add_aneg_done_function.patch [deleted file]
target/linux/generic/hack-4.14/721-phy_packets.patch [deleted file]
target/linux/generic/hack-4.14/773-bgmac-add-srab-switch.patch [deleted file]
target/linux/generic/hack-4.14/901-debloat_sock_diag.patch [deleted file]
target/linux/generic/hack-4.14/902-debloat_proc.patch [deleted file]
target/linux/generic/hack-4.14/904-debloat_dma_buf.patch [deleted file]
target/linux/generic/hack-4.14/910-kobject_uevent.patch [deleted file]
target/linux/generic/hack-4.14/911-kobject_add_broadcast_uevent.patch [deleted file]
target/linux/generic/hack-4.14/921-always-create-console-node-in-initramfs.patch [deleted file]
target/linux/generic/hack-4.14/930-crashlog.patch [deleted file]
target/linux/generic/pending-4.14/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch [deleted file]
target/linux/generic/pending-4.14/102-MIPS-only-process-negative-stack-offsets-on-stack-tr.patch [deleted file]
target/linux/generic/pending-4.14/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch [deleted file]
target/linux/generic/pending-4.14/110-ehci_hcd_ignore_oc.patch [deleted file]
target/linux/generic/pending-4.14/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch [deleted file]
target/linux/generic/pending-4.14/130-add-linux-spidev-compatible-si3210.patch [deleted file]
target/linux/generic/pending-4.14/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch [deleted file]
target/linux/generic/pending-4.14/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch [deleted file]
target/linux/generic/pending-4.14/141-jffs2-add-RENAME_EXCHANGE-support.patch [deleted file]
target/linux/generic/pending-4.14/150-bridge_allow_receiption_on_disabled_port.patch [deleted file]
target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch [deleted file]
target/linux/generic/pending-4.14/171-usb-dwc2-Fix-inefficient-copy-of-unaligned-buffers.patch [deleted file]
target/linux/generic/pending-4.14/180-net-phy-at803x-add-support-for-AT8032.patch [deleted file]
target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch [deleted file]
target/linux/generic/pending-4.14/201-extra_optimization.patch [deleted file]
target/linux/generic/pending-4.14/203-kallsyms_uncompressed.patch [deleted file]
target/linux/generic/pending-4.14/205-backtrace_module_info.patch [deleted file]
target/linux/generic/pending-4.14/220-optimize_inlining.patch [deleted file]
target/linux/generic/pending-4.14/240-remove-unsane-filenames-from-deps_initramfs-list.patch [deleted file]
target/linux/generic/pending-4.14/261-enable_wilink_platform_without_drivers.patch [deleted file]
target/linux/generic/pending-4.14/270-platform-mikrotik-build-bits.patch [deleted file]
target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch [deleted file]
target/linux/generic/pending-4.14/302-mips_no_branch_likely.patch [deleted file]
target/linux/generic/pending-4.14/304-mips_disable_fpu.patch [deleted file]
target/linux/generic/pending-4.14/305-mips_module_reloc.patch [deleted file]
target/linux/generic/pending-4.14/306-mips_mem_functions_performance.patch [deleted file]
target/linux/generic/pending-4.14/307-mips_highmem_offset.patch [deleted file]
target/linux/generic/pending-4.14/308-mips32r2_tune.patch [deleted file]
target/linux/generic/pending-4.14/309-MIPS-Add-CPU-option-reporting-to-proc-cpuinfo.patch [deleted file]
target/linux/generic/pending-4.14/310-arm_module_unresolved_weak_sym.patch [deleted file]
target/linux/generic/pending-4.14/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch [deleted file]
target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch [deleted file]
target/linux/generic/pending-4.14/333-arc-enable-unaligned-access-in-kernel-mode.patch [deleted file]
target/linux/generic/pending-4.14/340-MIPS-mm-remove-mips_dma_mapping_error.patch [deleted file]
target/linux/generic/pending-4.14/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch [deleted file]
target/linux/generic/pending-4.14/342-powerpc-Enable-kernel-XZ-compression-option-on-PPC_8.patch [deleted file]
target/linux/generic/pending-4.14/400-mtd-add-rootfs-split-support.patch [deleted file]
target/linux/generic/pending-4.14/401-mtd-add-support-for-different-partition-parser-types.patch [deleted file]
target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch [deleted file]
target/linux/generic/pending-4.14/403-mtd-hook-mtdsplit-to-Kbuild.patch [deleted file]
target/linux/generic/pending-4.14/404-mtd-add-more-helper-functions.patch [deleted file]
target/linux/generic/pending-4.14/411-mtd-partial_eraseblock_write.patch [deleted file]
target/linux/generic/pending-4.14/412-mtd-partial_eraseblock_unlock.patch [deleted file]
target/linux/generic/pending-4.14/419-mtd-redboot-add-of_match_table-with-DT-binding.patch [deleted file]
target/linux/generic/pending-4.14/420-mtd-redboot_space.patch [deleted file]
target/linux/generic/pending-4.14/430-mtd-add-myloader-partition-parser.patch [deleted file]
target/linux/generic/pending-4.14/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch [deleted file]
target/linux/generic/pending-4.14/432-mtd-bcm47xxpart-detect-T_Meter-partition.patch [deleted file]
target/linux/generic/pending-4.14/435-mtd-add-routerbootpart-parser-config.patch [deleted file]
target/linux/generic/pending-4.14/440-block2mtd_init.patch [deleted file]
target/linux/generic/pending-4.14/441-block2mtd_probe.patch [deleted file]
target/linux/generic/pending-4.14/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch [deleted file]
target/linux/generic/pending-4.14/450-mtd-spi-nor-allow-NOR-driver-to-write-fewer-bytes-th.patch [deleted file]
target/linux/generic/pending-4.14/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch [deleted file]
target/linux/generic/pending-4.14/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch [deleted file]
target/linux/generic/pending-4.14/465-m25p80-mx-disable-software-protection.patch [deleted file]
target/linux/generic/pending-4.14/466-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch [deleted file]
target/linux/generic/pending-4.14/470-mtd-spi-nor-support-limiting-4K-sectors-support-base.patch [deleted file]
target/linux/generic/pending-4.14/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch [deleted file]
target/linux/generic/pending-4.14/476-mtd-spi-nor-add-eon-en25q128.patch [deleted file]
target/linux/generic/pending-4.14/477-mtd-add-spi-nor-add-mx25u3235f.patch [deleted file]
target/linux/generic/pending-4.14/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch [deleted file]
target/linux/generic/pending-4.14/479-mtd-spi-nor-add-eon-en25qh32.patch [deleted file]
target/linux/generic/pending-4.14/479-mtd-spi-nor-add-eon-en25qh64.patch [deleted file]
target/linux/generic/pending-4.14/479-mtd-spi-nor-add-xtx-xt25f128b.patch [deleted file]
target/linux/generic/pending-4.14/480-mtd-set-rootfs-to-be-root-dev.patch [deleted file]
target/linux/generic/pending-4.14/481-mtd-spi-nor-add-support-for-Gigadevice-GD25D05.patch [deleted file]
target/linux/generic/pending-4.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch [deleted file]
target/linux/generic/pending-4.14/491-ubi-auto-create-ubiblock-device-for-rootfs.patch [deleted file]
target/linux/generic/pending-4.14/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch [deleted file]
target/linux/generic/pending-4.14/493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch [deleted file]
target/linux/generic/pending-4.14/494-mtd-ubi-add-EOF-marker-support.patch [deleted file]
target/linux/generic/pending-4.14/495-mtd-core-add-get_mtd_device_by_node.patch [deleted file]
target/linux/generic/pending-4.14/496-dt-bindings-add-bindings-for-mtd-concat-devices.patch [deleted file]
target/linux/generic/pending-4.14/497-mtd-mtdconcat-add-dt-driver-for-concat-devices.patch [deleted file]
target/linux/generic/pending-4.14/530-jffs2_make_lzma_available.patch [deleted file]
target/linux/generic/pending-4.14/532-jffs2_eofdetect.patch [deleted file]
target/linux/generic/pending-4.14/600-netfilter_conntrack_flush.patch [deleted file]
target/linux/generic/pending-4.14/610-netfilter_match_bypass_default_checks.patch [deleted file]
target/linux/generic/pending-4.14/611-netfilter_match_bypass_default_table.patch [deleted file]
target/linux/generic/pending-4.14/612-netfilter_match_reduce_memory_access.patch [deleted file]
target/linux/generic/pending-4.14/613-netfilter_optional_tcp_window_check.patch [deleted file]
target/linux/generic/pending-4.14/620-net_sched-codel-do-not-defer-queue-length-update.patch [deleted file]
target/linux/generic/pending-4.14/630-packet_socket_type.patch [deleted file]
target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch [deleted file]
target/linux/generic/pending-4.14/641-netfilter-nf_flow_table-support-hw-offload-through-v.patch [deleted file]
target/linux/generic/pending-4.14/642-net-8021q-support-hardware-flow-table-offload.patch [deleted file]
target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch [deleted file]
target/linux/generic/pending-4.14/644-net-pppoe-support-hardware-flow-table-offload.patch [deleted file]
target/linux/generic/pending-4.14/645-netfilter-nf_flow_table-rework-hardware-offload-time.patch [deleted file]
target/linux/generic/pending-4.14/646-netfilter-nf_flow_table-rework-private-driver-data.patch [deleted file]
target/linux/generic/pending-4.14/655-increase_skb_pad.patch [deleted file]
target/linux/generic/pending-4.14/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch [deleted file]
target/linux/generic/pending-4.14/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch [deleted file]
target/linux/generic/pending-4.14/671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch [deleted file]
target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch [deleted file]
target/linux/generic/pending-4.14/681-NET-add-of_get_mac_address_mtd.patch [deleted file]
target/linux/generic/pending-4.14/690-net-add-support-for-threaded-NAPI-polling.patch [deleted file]
target/linux/generic/pending-4.14/703-phy-add-detach-callback-to-struct-phy_driver.patch [deleted file]
target/linux/generic/pending-4.14/734-net-phy-at803x-allow-to-configure-via-pdata.patch [deleted file]
target/linux/generic/pending-4.14/735-net-phy-at803x-fix-at8033-sgmii-mode.patch [deleted file]
target/linux/generic/pending-4.14/810-pci_disable_common_quirks.patch [deleted file]
target/linux/generic/pending-4.14/811-pci_disable_usb_common_quirks.patch [deleted file]
target/linux/generic/pending-4.14/834-ledtrig-libata.patch [deleted file]
target/linux/generic/pending-4.14/920-mangle_bootargs.patch [deleted file]

index fbb70cab69ee16ab10ceb2ef0b3a70f04a3e1491..071e6a65df30bc671e32c9839e6520f018ee3982 100644 (file)
@@ -6,11 +6,9 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-4.14 = .193
 LINUX_VERSION-4.19 = .138
 LINUX_VERSION-5.4 = .61
 
-LINUX_KERNEL_HASH-4.14.193 = 0b0fb41d4430e1a42738b341cbfd2f41951aa5cd02acabbd53f076119c8b9f03
 LINUX_KERNEL_HASH-4.19.138 = d15c27d05f6c527269b75b30cc72972748e55720e7e00ad8abbaa4fe3b1d5e02
 LINUX_KERNEL_HASH-5.4.61 = 86f13d050f6389c5a1727fa81510ee8eceac795297bc584f443354609617fea4
 
diff --git a/target/linux/generic/backport-4.14/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch b/target/linux/generic/backport-4.14/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch
deleted file mode 100644 (file)
index 7ac4f9d..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 13b1ecc3401653a355798eb1dee10cc1608202f4 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Mon, 18 Jan 2016 12:27:49 +0100
-Subject: [PATCH 33/34] Kbuild: don't hardcode path to awk in
- scripts/ld-version.sh
-
-On some systems /usr/bin/awk does not exist, or is broken. Find it via
-$PATH instead.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- scripts/ld-version.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/scripts/ld-version.sh
-+++ b/scripts/ld-version.sh
-@@ -1,6 +1,7 @@
--#!/usr/bin/awk -f
-+#!/bin/sh
- # SPDX-License-Identifier: GPL-2.0
- # extract linker version number from stdin and turn into single number
-+exec awk '
-       {
-       gsub(".*\\)", "");
-       gsub(".*version ", "");
-@@ -9,3 +10,4 @@
-       print a[1]*100000000 + a[2]*1000000 + a[3]*10000;
-       exit
-       }
-+'
diff --git a/target/linux/generic/backport-4.14/011-kbuild-export-SUBARCH.patch b/target/linux/generic/backport-4.14/011-kbuild-export-SUBARCH.patch
deleted file mode 100644 (file)
index 1c82a95..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-From 173019b66dcc9d68ad9333aa744dad1e369b5aa8 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sun, 9 Jul 2017 00:26:53 +0200
-Subject: [PATCH 34/34] kernel: add compile fix for linux 4.9 on x86
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -429,8 +429,8 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/s
- GCC_PLUGINS_CFLAGS :=
- CLANG_FLAGS :=
--export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
--export CPP AR NM STRIP OBJCOPY OBJDUMP HOSTLDFLAGS HOST_LOADLIBES
-+export ARCH SRCARCH SUBARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD
-+export CC CPP AR NM STRIP OBJCOPY OBJDUMP HOSTLDFLAGS HOST_LOADLIBES
- export MAKE AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE
- export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
diff --git a/target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch b/target/linux/generic/backport-4.14/012-kbuild-add-macro-for-controlling-warnings-to-linux-c.patch
deleted file mode 100644 (file)
index 8993b63..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-From: Arnd Bergmann <arnd@arndb.de>
-Date: Tue, 19 Jun 2018 13:14:56 -0700
-Subject: [PATCH] kbuild: add macro for controlling warnings to
- linux/compiler.h
-
-I have occasionally run into a situation where it would make sense to
-control a compiler warning from a source file rather than doing so from
-a Makefile using the $(cc-disable-warning, ...) or $(cc-option, ...)
-helpers.
-
-The approach here is similar to what glibc uses, using __diag() and
-related macros to encapsulate a _Pragma("GCC diagnostic ...") statement
-that gets turned into the respective "#pragma GCC diagnostic ..." by
-the preprocessor when the macro gets expanded.
-
-Like glibc, I also have an argument to pass the affected compiler
-version, but decided to actually evaluate that one. For now, this
-supports GCC_4_6, GCC_4_7, GCC_4_8, GCC_4_9, GCC_5, GCC_6, GCC_7,
-GCC_8 and GCC_9. Adding support for CLANG_5 and other interesting
-versions is straightforward here. GNU compilers starting with gcc-4.2
-could support it in principle, but "#pragma GCC diagnostic push"
-was only added in gcc-4.6, so it seems simpler to not deal with those
-at all. The same versions show a large number of warnings already,
-so it seems easier to just leave it at that and not do a more
-fine-grained control for them.
-
-The use cases I found so far include:
-
-- turning off the gcc-8 -Wattribute-alias warning inside of the
-  SYSCALL_DEFINEx() macro without having to do it globally.
-
-- Reducing the build time for a simple re-make after a change,
-  once we move the warnings from ./Makefile and
-  ./scripts/Makefile.extrawarn into linux/compiler.h
-
-- More control over the warnings based on other configurations,
-  using preprocessor syntax instead of Makefile syntax. This should make
-  it easier for the average developer to understand and change things.
-
-- Adding an easy way to turn the W=1 option on unconditionally
-  for a subdirectory or a specific file. This has been requested
-  by several developers in the past that want to have their subsystems
-  W=1 clean.
-
-- Integrating clang better into the build systems. Clang supports
-  more warnings than GCC, and we probably want to classify them
-  as default, W=1, W=2 etc, but there are cases in which the
-  warnings should be classified differently due to excessive false
-  positives from one or the other compiler.
-
-- Adding a way to turn the default warnings into errors (e.g. using
-  a new "make E=0" tag) while not also turning the W=1 warnings into
-  errors.
-
-This patch for now just adds the minimal infrastructure in order to
-do the first of the list above. As the #pragma GCC diagnostic
-takes precedence over command line options, the next step would be
-to convert a lot of the individual Makefiles that set nonstandard
-options to use __diag() instead.
-
-[paul.burton@mips.com:
-  - Rebase atop current master.
-  - Add __diag_GCC, or more generally __diag_<compiler>, abstraction to
-    avoid code outside of linux/compiler-gcc.h needing to duplicate
-    knowledge about different GCC versions.
-  - Add a comment argument to __diag_{ignore,warn,error} which isn't
-    used in the expansion of the macros but serves to push people to
-    document the reason for using them - per feedback from Kees Cook.
-  - Translate severity to GCC-specific pragmas in linux/compiler-gcc.h
-    rather than using GCC-specific in linux/compiler_types.h.
-  - Drop all but GCC 8 macros, since we only need to define macros for
-    versions that we need to introduce pragmas for, and as of this
-    series that's just GCC 8.
-  - Capitalize comments in linux/compiler-gcc.h to match the style of
-    the rest of the file.
-  - Line up macro definitions with tabs in linux/compiler-gcc.h.]
-
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Paul Burton <paul.burton@mips.com>
-Tested-by: Christophe Leroy <christophe.leroy@c-s.fr>
-Tested-by: Stafford Horne <shorne@gmail.com>
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
----
-
---- a/include/linux/compiler-gcc.h
-+++ b/include/linux/compiler-gcc.h
-@@ -366,3 +366,30 @@
- #if GCC_VERSION >= 50100
- #define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1
- #endif
-+
-+
-+/*
-+ * Turn individual warnings and errors on and off locally, depending
-+ * on version.
-+ */
-+#define __diag_GCC(version, severity, s) \
-+      __diag_GCC_ ## version(__diag_GCC_ ## severity s)
-+
-+/* Severity used in pragma directives */
-+#define __diag_GCC_ignore     ignored
-+#define __diag_GCC_warn               warning
-+#define __diag_GCC_error      error
-+
-+/* Compilers before gcc-4.6 do not understand "#pragma GCC diagnostic push" */
-+#if GCC_VERSION >= 40600
-+#define __diag_str1(s)                #s
-+#define __diag_str(s)         __diag_str1(s)
-+#define __diag(s)             _Pragma(__diag_str(GCC diagnostic s))
-+#endif
-+
-+#if GCC_VERSION >= 80000
-+#define __diag_GCC_8(s)               __diag(s)
-+#else
-+#define __diag_GCC_8(s)
-+#endif
-+
---- a/include/linux/compiler_types.h
-+++ b/include/linux/compiler_types.h
-@@ -287,4 +287,22 @@ struct ftrace_likely_data {
- # define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
- #endif
-+#ifndef __diag
-+#define __diag(string)
-+#endif
-+
-+#ifndef __diag_GCC
-+#define __diag_GCC(version, severity, string)
-+#endif
-+
-+#define __diag_push() __diag(push)
-+#define __diag_pop()  __diag(pop)
-+
-+#define __diag_ignore(compiler, version, option, comment) \
-+      __diag_ ## compiler(version, ignore, option)
-+#define __diag_warn(compiler, version, option, comment) \
-+      __diag_ ## compiler(version, warn, option)
-+#define __diag_error(compiler, version, option, comment) \
-+      __diag_ ## compiler(version, error, option)
-+
- #endif /* __LINUX_COMPILER_TYPES_H */
diff --git a/target/linux/generic/backport-4.14/013-disable-Wattribute-alias-warning-for-SYSCALL_DEFINEx.patch b/target/linux/generic/backport-4.14/013-disable-Wattribute-alias-warning-for-SYSCALL_DEFINEx.patch
deleted file mode 100644 (file)
index 2440ed8..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-From: Arnd Bergmann <arnd@arndb.de>
-Date: Tue, 19 Jun 2018 13:14:57 -0700
-Subject: [PATCH] disable -Wattribute-alias warning for SYSCALL_DEFINEx()
-
-gcc-8 warns for every single definition of a system call entry
-point, e.g.:
-
-include/linux/compat.h:56:18: error: 'compat_sys_rt_sigprocmask' alias between functions of incompatible types 'long int(int,  compat_sigset_t *, compat_sigset_t *, compat_size_t)' {aka 'long int(int,  struct <anonymous> *, struct <anonymous> *, unsigned int)'} and 'long int(long int,  long int,  long int,  long int)' [-Werror=attribute-alias]
-  asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))\
-                  ^~~~~~~~~~
-include/linux/compat.h:45:2: note: in expansion of macro 'COMPAT_SYSCALL_DEFINEx'
-  COMPAT_SYSCALL_DEFINEx(4, _##name, __VA_ARGS__)
-  ^~~~~~~~~~~~~~~~~~~~~~
-kernel/signal.c:2601:1: note: in expansion of macro 'COMPAT_SYSCALL_DEFINE4'
- COMPAT_SYSCALL_DEFINE4(rt_sigprocmask, int, how, compat_sigset_t __user *, nset,
- ^~~~~~~~~~~~~~~~~~~~~~
-include/linux/compat.h:60:18: note: aliased declaration here
-  asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))\
-                  ^~~~~~~~~~
-
-The new warning seems reasonable in principle, but it doesn't
-help us here, since we rely on the type mismatch to sanitize the
-system call arguments. After I reported this as GCC PR82435, a new
--Wno-attribute-alias option was added that could be used to turn the
-warning off globally on the command line, but I'd prefer to do it a
-little more fine-grained.
-
-Interestingly, turning a warning off and on again inside of
-a single macro doesn't always work, in this case I had to add
-an extra statement inbetween and decided to copy the __SC_TEST
-one from the native syscall to the compat syscall macro.  See
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83256 for more details
-about this.
-
-[paul.burton@mips.com:
-  - Rebase atop current master.
-  - Split GCC & version arguments to __diag_ignore() in order to match
-    changes to the preceding patch.
-  - Add the comment argument to match the preceding patch.]
-
-Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82435
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Paul Burton <paul.burton@mips.com>
-Tested-by: Christophe Leroy <christophe.leroy@c-s.fr>
-Tested-by: Stafford Horne <shorne@gmail.com>
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
----
-
---- a/include/linux/compat.h
-+++ b/include/linux/compat.h
-@@ -48,6 +48,9 @@
-       COMPAT_SYSCALL_DEFINEx(6, _##name, __VA_ARGS__)
- #define COMPAT_SYSCALL_DEFINEx(x, name, ...)                          \
-+      __diag_push();                                                  \
-+      __diag_ignore(GCC, 8, "-Wattribute-alias",                      \
-+                    "Type aliasing is used to sanitize syscall arguments");\
-       asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))\
-               __attribute__((alias(__stringify(compat_SyS##name))));  \
-       static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
-@@ -56,6 +59,7 @@
-       {                                                               \
-               return C_SYSC##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__)); \
-       }                                                               \
-+      __diag_pop();                                                   \
-       static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
- #ifndef compat_user_stack_pointer
---- a/include/linux/syscalls.h
-+++ b/include/linux/syscalls.h
-@@ -208,6 +208,9 @@ static inline int is_syscall_trace_event
- #define __PROTECT(...) asmlinkage_protect(__VA_ARGS__)
- #define __SYSCALL_DEFINEx(x, name, ...)                                       \
-+      __diag_push();                                                  \
-+      __diag_ignore(GCC, 8, "-Wattribute-alias",                      \
-+                    "Type aliasing is used to sanitize syscall arguments");\
-       asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))       \
-               __attribute__((alias(__stringify(SyS##name))));         \
-       static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));  \
-@@ -219,6 +222,7 @@ static inline int is_syscall_trace_event
-               __PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__));       \
-               return ret;                                             \
-       }                                                               \
-+      __diag_pop();                                                   \
-       static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
- /*
diff --git a/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch b/target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch
deleted file mode 100644 (file)
index 88e5386..0000000
+++ /dev/null
@@ -1,558 +0,0 @@
-From 1bb0c3ec899827cfa4668bb63a08713a40744d21 Mon Sep 17 00:00:00 2001
-From: Florian Westphal <fw@strlen.de>
-Date: Sun, 9 Jul 2017 08:58:30 +0200
-Subject: [PATCH] netfilter: conntrack: cache route for forwarded connections
-
-... to avoid per-packet FIB lookup if possible.
-
-The cached dst is re-used provided the input interface
-is the same as that of the previous packet in the same direction.
-
-If not, the cached dst is invalidated.
-
-For ipv6 we also need to store sernum, else dst_check doesn't work,
-pointed out by Eric Dumazet.
-
-This should speed up forwarding when conntrack is already in use
-anyway, especially when using reverse path filtering -- active RPF
-enforces two FIB lookups for each packet.
-
-Before the routing cache removal this didn't matter since RPF was performed
-only when route cache didn't yield a result; but without route cache it
-comes at higher price.
-
-Julian Anastasov suggested to add NETDEV_UNREGISTER handler to
-avoid holding on to dsts of 'frozen' conntracks.
-
-Signed-off-by: Florian Westphal <fw@strlen.de>
----
- include/net/netfilter/nf_conntrack_extend.h  |   4 +
- include/net/netfilter/nf_conntrack_rtcache.h |  34 +++
- net/netfilter/Kconfig                        |  12 +
- net/netfilter/Makefile                       |   3 +
- net/netfilter/nf_conntrack_rtcache.c         | 428 +++++++++++++++++++++++++++
- 5 files changed, 481 insertions(+)
- create mode 100644 include/net/netfilter/nf_conntrack_rtcache.h
- create mode 100644 net/netfilter/nf_conntrack_rtcache.c
-
---- a/include/net/netfilter/nf_conntrack_extend.h
-+++ b/include/net/netfilter/nf_conntrack_extend.h
-@@ -28,6 +28,9 @@ enum nf_ct_ext_id {
- #if IS_ENABLED(CONFIG_NETFILTER_SYNPROXY)
-       NF_CT_EXT_SYNPROXY,
- #endif
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_RTCACHE)
-+      NF_CT_EXT_RTCACHE,
-+#endif
-       NF_CT_EXT_NUM,
- };
-@@ -40,6 +43,7 @@ enum nf_ct_ext_id {
- #define NF_CT_EXT_TIMEOUT_TYPE struct nf_conn_timeout
- #define NF_CT_EXT_LABELS_TYPE struct nf_conn_labels
- #define NF_CT_EXT_SYNPROXY_TYPE struct nf_conn_synproxy
-+#define NF_CT_EXT_RTCACHE_TYPE struct nf_conn_rtcache
- /* Extensions: optional stuff which isn't permanently in struct. */
- struct nf_ct_ext {
---- /dev/null
-+++ b/include/net/netfilter/nf_conntrack_rtcache.h
-@@ -0,0 +1,34 @@
-+#include <linux/gfp.h>
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_extend.h>
-+
-+struct dst_entry;
-+
-+struct nf_conn_dst_cache {
-+      struct dst_entry *dst;
-+      int iif;
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+      u32 cookie;
-+#endif
-+
-+};
-+
-+struct nf_conn_rtcache {
-+      struct nf_conn_dst_cache cached_dst[IP_CT_DIR_MAX];
-+};
-+
-+static inline
-+struct nf_conn_rtcache *nf_ct_rtcache_find(const struct nf_conn *ct)
-+{
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_RTCACHE)
-+      return nf_ct_ext_find(ct, NF_CT_EXT_RTCACHE);
-+#else
-+      return NULL;
-+#endif
-+}
-+
-+static inline int nf_conn_rtcache_iif_get(const struct nf_conn_rtcache *rtc,
-+                                        enum ip_conntrack_dir dir)
-+{
-+      return rtc->cached_dst[dir].iif;
-+}
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -118,6 +118,18 @@ config NF_CONNTRACK_EVENTS
-         If unsure, say `N'.
-+config NF_CONNTRACK_RTCACHE
-+      tristate "Cache route entries in conntrack objects"
-+      depends on NETFILTER_ADVANCED
-+      depends on NF_CONNTRACK
-+      help
-+        If this option is enabled, the connection tracking code will
-+        cache routing information for each connection that is being
-+        forwarded, at a cost of 32 bytes per conntrack object.
-+
-+        To compile it as a module, choose M here.  If unsure, say N.
-+        The module will be called nf_conntrack_rtcache.
-+
- config NF_CONNTRACK_TIMEOUT
-       bool  'Connection tracking timeout'
-       depends on NETFILTER_ADVANCED
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -19,6 +19,9 @@ obj-$(CONFIG_NETFILTER_NETLINK_LOG) += n
- # connection tracking
- obj-$(CONFIG_NF_CONNTRACK) += nf_conntrack.o
-+# optional conntrack route cache extension
-+obj-$(CONFIG_NF_CONNTRACK_RTCACHE) += nf_conntrack_rtcache.o
-+
- obj-$(CONFIG_NF_CT_PROTO_GRE) += nf_conntrack_proto_gre.o
- # netlink interface for nf_conntrack
---- /dev/null
-+++ b/net/netfilter/nf_conntrack_rtcache.c
-@@ -0,0 +1,428 @@
-+/* route cache for netfilter.
-+ *
-+ * (C) 2014 Red Hat GmbH
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-+
-+#include <linux/types.h>
-+#include <linux/netfilter.h>
-+#include <linux/skbuff.h>
-+#include <linux/stddef.h>
-+#include <linux/kernel.h>
-+#include <linux/netdevice.h>
-+#include <linux/export.h>
-+#include <linux/module.h>
-+
-+#include <net/dst.h>
-+
-+#include <net/netfilter/nf_conntrack.h>
-+#include <net/netfilter/nf_conntrack_core.h>
-+#include <net/netfilter/nf_conntrack_extend.h>
-+#include <net/netfilter/nf_conntrack_rtcache.h>
-+
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+#include <net/ip6_fib.h>
-+#endif
-+
-+static void __nf_conn_rtcache_destroy(struct nf_conn_rtcache *rtc,
-+                                    enum ip_conntrack_dir dir)
-+{
-+      struct dst_entry *dst = rtc->cached_dst[dir].dst;
-+
-+      dst_release(dst);
-+}
-+
-+static void nf_conn_rtcache_destroy(struct nf_conn *ct)
-+{
-+      struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct);
-+
-+      if (!rtc)
-+              return;
-+
-+      __nf_conn_rtcache_destroy(rtc, IP_CT_DIR_ORIGINAL);
-+      __nf_conn_rtcache_destroy(rtc, IP_CT_DIR_REPLY);
-+}
-+
-+static void nf_ct_rtcache_ext_add(struct nf_conn *ct)
-+{
-+      struct nf_conn_rtcache *rtc;
-+
-+      rtc = nf_ct_ext_add(ct, NF_CT_EXT_RTCACHE, GFP_ATOMIC);
-+      if (rtc) {
-+              rtc->cached_dst[IP_CT_DIR_ORIGINAL].iif = -1;
-+              rtc->cached_dst[IP_CT_DIR_ORIGINAL].dst = NULL;
-+              rtc->cached_dst[IP_CT_DIR_REPLY].iif = -1;
-+              rtc->cached_dst[IP_CT_DIR_REPLY].dst = NULL;
-+      }
-+}
-+
-+static struct nf_conn_rtcache *nf_ct_rtcache_find_usable(struct nf_conn *ct)
-+{
-+      return nf_ct_rtcache_find(ct);
-+}
-+
-+static struct dst_entry *
-+nf_conn_rtcache_dst_get(const struct nf_conn_rtcache *rtc,
-+                      enum ip_conntrack_dir dir)
-+{
-+      return rtc->cached_dst[dir].dst;
-+}
-+
-+static u32 nf_rtcache_get_cookie(int pf, const struct dst_entry *dst)
-+{
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+      if (pf == NFPROTO_IPV6) {
-+              const struct rt6_info *rt = (const struct rt6_info *)dst;
-+
-+              if (rt->rt6i_node)
-+                      return (u32)rt->rt6i_node->fn_sernum;
-+      }
-+#endif
-+      return 0;
-+}
-+
-+static void nf_conn_rtcache_dst_set(int pf,
-+                                  struct nf_conn_rtcache *rtc,
-+                                  struct dst_entry *dst,
-+                                  enum ip_conntrack_dir dir, int iif)
-+{
-+      if (rtc->cached_dst[dir].iif != iif)
-+              rtc->cached_dst[dir].iif = iif;
-+
-+      if (rtc->cached_dst[dir].dst != dst) {
-+              struct dst_entry *old;
-+
-+              dst_hold(dst);
-+
-+              old = xchg(&rtc->cached_dst[dir].dst, dst);
-+              dst_release(old);
-+
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+              if (pf == NFPROTO_IPV6)
-+                      rtc->cached_dst[dir].cookie =
-+                              nf_rtcache_get_cookie(pf, dst);
-+#endif
-+      }
-+}
-+
-+static void nf_conn_rtcache_dst_obsolete(struct nf_conn_rtcache *rtc,
-+                                       enum ip_conntrack_dir dir)
-+{
-+      struct dst_entry *old;
-+
-+      pr_debug("Invalidate iif %d for dir %d on cache %p\n",
-+               rtc->cached_dst[dir].iif, dir, rtc);
-+
-+      old = xchg(&rtc->cached_dst[dir].dst, NULL);
-+      dst_release(old);
-+      rtc->cached_dst[dir].iif = -1;
-+}
-+
-+static unsigned int nf_rtcache_in(u_int8_t pf,
-+                                struct sk_buff *skb,
-+                                const struct nf_hook_state *state)
-+{
-+      struct nf_conn_rtcache *rtc;
-+      enum ip_conntrack_info ctinfo;
-+      enum ip_conntrack_dir dir;
-+      struct dst_entry *dst;
-+      struct nf_conn *ct;
-+      int iif;
-+      u32 cookie;
-+
-+      if (skb_dst(skb) || skb->sk)
-+              return NF_ACCEPT;
-+
-+      ct = nf_ct_get(skb, &ctinfo);
-+      if (!ct)
-+              return NF_ACCEPT;
-+
-+      rtc = nf_ct_rtcache_find_usable(ct);
-+      if (!rtc)
-+              return NF_ACCEPT;
-+
-+      /* if iif changes, don't use cache and let ip stack
-+       * do route lookup.
-+       *
-+       * If rp_filter is enabled it might toss skb, so
-+       * we don't want to avoid these checks.
-+       */
-+      dir = CTINFO2DIR(ctinfo);
-+      iif = nf_conn_rtcache_iif_get(rtc, dir);
-+      if (state->in->ifindex != iif) {
-+              pr_debug("ct %p, iif %d, cached iif %d, skip cached entry\n",
-+                       ct, iif, state->in->ifindex);
-+              return NF_ACCEPT;
-+      }
-+      dst = nf_conn_rtcache_dst_get(rtc, dir);
-+      if (dst == NULL)
-+              return NF_ACCEPT;
-+
-+      cookie = nf_rtcache_get_cookie(pf, dst);
-+
-+      dst = dst_check(dst, cookie);
-+      pr_debug("obtained dst %p for skb %p, cookie %d\n", dst, skb, cookie);
-+      if (likely(dst))
-+              skb_dst_set_noref(skb, dst);
-+      else
-+              nf_conn_rtcache_dst_obsolete(rtc, dir);
-+
-+      return NF_ACCEPT;
-+}
-+
-+static unsigned int nf_rtcache_forward(u_int8_t pf,
-+                                     struct sk_buff *skb,
-+                                     const struct nf_hook_state *state)
-+{
-+      struct nf_conn_rtcache *rtc;
-+      enum ip_conntrack_info ctinfo;
-+      enum ip_conntrack_dir dir;
-+      struct nf_conn *ct;
-+      struct dst_entry *dst = skb_dst(skb);
-+      int iif;
-+
-+      ct = nf_ct_get(skb, &ctinfo);
-+      if (!ct)
-+              return NF_ACCEPT;
-+
-+      if (dst && dst_xfrm(dst))
-+              return NF_ACCEPT;
-+
-+      if (!nf_ct_is_confirmed(ct)) {
-+              if (WARN_ON(nf_ct_rtcache_find(ct)))
-+                      return NF_ACCEPT;
-+              nf_ct_rtcache_ext_add(ct);
-+              return NF_ACCEPT;
-+      }
-+
-+      rtc = nf_ct_rtcache_find_usable(ct);
-+      if (!rtc)
-+              return NF_ACCEPT;
-+
-+      dir = CTINFO2DIR(ctinfo);
-+      iif = nf_conn_rtcache_iif_get(rtc, dir);
-+      pr_debug("ct %p, skb %p, dir %d, iif %d, cached iif %d\n",
-+               ct, skb, dir, iif, state->in->ifindex);
-+      if (likely(state->in->ifindex == iif))
-+              return NF_ACCEPT;
-+
-+      nf_conn_rtcache_dst_set(pf, rtc, skb_dst(skb), dir, state->in->ifindex);
-+      return NF_ACCEPT;
-+}
-+
-+static unsigned int nf_rtcache_in4(void *priv,
-+                                struct sk_buff *skb,
-+                                const struct nf_hook_state *state)
-+{
-+      return nf_rtcache_in(NFPROTO_IPV4, skb, state);
-+}
-+
-+static unsigned int nf_rtcache_forward4(void *priv,
-+                                     struct sk_buff *skb,
-+                                     const struct nf_hook_state *state)
-+{
-+      return nf_rtcache_forward(NFPROTO_IPV4, skb, state);
-+}
-+
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+static unsigned int nf_rtcache_in6(void *priv,
-+                                struct sk_buff *skb,
-+                                const struct nf_hook_state *state)
-+{
-+      return nf_rtcache_in(NFPROTO_IPV6, skb, state);
-+}
-+
-+static unsigned int nf_rtcache_forward6(void *priv,
-+                                     struct sk_buff *skb,
-+                                     const struct nf_hook_state *state)
-+{
-+      return nf_rtcache_forward(NFPROTO_IPV6, skb, state);
-+}
-+#endif
-+
-+static int nf_rtcache_dst_remove(struct nf_conn *ct, void *data)
-+{
-+      struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct);
-+      struct net_device *dev = data;
-+
-+      if (!rtc)
-+              return 0;
-+
-+      if (dev->ifindex == rtc->cached_dst[IP_CT_DIR_ORIGINAL].iif ||
-+          dev->ifindex == rtc->cached_dst[IP_CT_DIR_REPLY].iif) {
-+              nf_conn_rtcache_dst_obsolete(rtc, IP_CT_DIR_ORIGINAL);
-+              nf_conn_rtcache_dst_obsolete(rtc, IP_CT_DIR_REPLY);
-+      }
-+
-+      return 0;
-+}
-+
-+static int nf_rtcache_netdev_event(struct notifier_block *this,
-+                                 unsigned long event, void *ptr)
-+{
-+      struct net_device *dev = netdev_notifier_info_to_dev(ptr);
-+      struct net *net = dev_net(dev);
-+
-+      if (event == NETDEV_DOWN)
-+              nf_ct_iterate_cleanup_net(net, nf_rtcache_dst_remove, dev, 0, 0);
-+
-+      return NOTIFY_DONE;
-+}
-+
-+static struct notifier_block nf_rtcache_notifier = {
-+      .notifier_call = nf_rtcache_netdev_event,
-+};
-+
-+static struct nf_hook_ops rtcache_ops[] = {
-+      {
-+              .hook           = nf_rtcache_in4,
-+              .pf             = NFPROTO_IPV4,
-+              .hooknum        = NF_INET_PRE_ROUTING,
-+              .priority       = NF_IP_PRI_LAST,
-+      },
-+      {
-+              .hook           = nf_rtcache_forward4,
-+              .pf             = NFPROTO_IPV4,
-+              .hooknum        = NF_INET_FORWARD,
-+              .priority       = NF_IP_PRI_LAST,
-+      },
-+#if IS_ENABLED(CONFIG_NF_CONNTRACK_IPV6)
-+      {
-+              .hook           = nf_rtcache_in6,
-+              .pf             = NFPROTO_IPV6,
-+              .hooknum        = NF_INET_PRE_ROUTING,
-+              .priority       = NF_IP_PRI_LAST,
-+      },
-+      {
-+              .hook           = nf_rtcache_forward6,
-+              .pf             = NFPROTO_IPV6,
-+              .hooknum        = NF_INET_FORWARD,
-+              .priority       = NF_IP_PRI_LAST,
-+      },
-+#endif
-+};
-+
-+static struct nf_ct_ext_type rtcache_extend __read_mostly = {
-+      .len    = sizeof(struct nf_conn_rtcache),
-+      .align  = __alignof__(struct nf_conn_rtcache),
-+      .id     = NF_CT_EXT_RTCACHE,
-+      .destroy = nf_conn_rtcache_destroy,
-+};
-+
-+static int __net_init rtcache_net_init(struct net *net)
-+{
-+      return nf_register_net_hooks(net, rtcache_ops, ARRAY_SIZE(rtcache_ops));
-+}
-+
-+static void __net_exit rtcache_net_exit(struct net *net)
-+{
-+      /* remove hooks so no new connections get rtcache extension */
-+      nf_unregister_net_hooks(net, rtcache_ops, ARRAY_SIZE(rtcache_ops));
-+}
-+
-+static struct pernet_operations rtcache_ops_net_ops = {
-+      .init   = rtcache_net_init,
-+      .exit   = rtcache_net_exit,
-+};
-+
-+static int __init nf_conntrack_rtcache_init(void)
-+{
-+      int ret = nf_ct_extend_register(&rtcache_extend);
-+
-+      if (ret < 0) {
-+              pr_err("nf_conntrack_rtcache: Unable to register extension\n");
-+              return ret;
-+      }
-+
-+      ret = register_pernet_subsys(&rtcache_ops_net_ops);
-+      if (ret) {
-+              nf_ct_extend_unregister(&rtcache_extend);
-+              return ret;
-+      }
-+
-+      ret = register_netdevice_notifier(&nf_rtcache_notifier);
-+      if (ret) {
-+              nf_ct_extend_unregister(&rtcache_extend);
-+              unregister_pernet_subsys(&rtcache_ops_net_ops);
-+      }
-+
-+      return ret;
-+}
-+
-+static int nf_rtcache_ext_remove(struct nf_conn *ct, void *data)
-+{
-+      struct nf_conn_rtcache *rtc = nf_ct_rtcache_find(ct);
-+
-+      return rtc != NULL;
-+}
-+
-+static bool __exit nf_conntrack_rtcache_wait_for_dying(struct net *net)
-+{
-+      bool wait = false;
-+      int cpu;
-+
-+      for_each_possible_cpu(cpu) {
-+              struct nf_conntrack_tuple_hash *h;
-+              struct hlist_nulls_node *n;
-+              struct nf_conn *ct;
-+              struct ct_pcpu *pcpu = per_cpu_ptr(net->ct.pcpu_lists, cpu);
-+
-+              rcu_read_lock();
-+              spin_lock_bh(&pcpu->lock);
-+
-+              hlist_nulls_for_each_entry(h, n, &pcpu->dying, hnnode) {
-+                      ct = nf_ct_tuplehash_to_ctrack(h);
-+                      if (nf_ct_rtcache_find(ct) != NULL) {
-+                              wait = true;
-+                              break;
-+                      }
-+              }
-+              spin_unlock_bh(&pcpu->lock);
-+              rcu_read_unlock();
-+      }
-+
-+      return wait;
-+}
-+
-+static void __exit nf_conntrack_rtcache_fini(void)
-+{
-+      struct net *net;
-+      int count = 0;
-+
-+      synchronize_net();
-+
-+      unregister_netdevice_notifier(&nf_rtcache_notifier);
-+      unregister_pernet_subsys(&rtcache_ops_net_ops);
-+
-+      synchronize_net();
-+
-+      rtnl_lock();
-+
-+      /* zap all conntracks with rtcache extension */
-+      for_each_net(net)
-+              nf_ct_iterate_cleanup_net(net, nf_rtcache_ext_remove, NULL, 0, 0);
-+
-+      for_each_net(net) {
-+              /* .. and make sure they're gone from dying list, too */
-+              while (nf_conntrack_rtcache_wait_for_dying(net)) {
-+                      msleep(200);
-+                      WARN_ONCE(++count > 25, "Waiting for all rtcache conntracks to go away\n");
-+              }
-+      }
-+
-+      rtnl_unlock();
-+
-+      synchronize_net();
-+      nf_ct_extend_unregister(&rtcache_extend);
-+}
-+module_init(nf_conntrack_rtcache_init);
-+module_exit(nf_conntrack_rtcache_fini);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Florian Westphal <fw@strlen.de>");
-+MODULE_DESCRIPTION("Conntrack route cache extension");
diff --git a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch
deleted file mode 100644 (file)
index 4f6f5d2..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From: Eric Dumazet <edumazet@google.com>
-Date: Sat, 11 Nov 2017 15:54:12 -0800
-Subject: [PATCH] tcp: allow drivers to tweak TSQ logic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-I had many reports that TSQ logic breaks wifi aggregation.
-
-Current logic is to allow up to 1 ms of bytes to be queued into qdisc
-and drivers queues.
-
-But Wifi aggregation needs a bigger budget to allow bigger rates to
-be discovered by various TCP Congestion Controls algorithms.
-
-This patch adds an extra socket field, allowing wifi drivers to select
-another log scale to derive TCP Small Queue credit from current pacing
-rate.
-
-Initial value is 10, meaning that this patch does not change current
-behavior.
-
-We expect wifi drivers to set this field to smaller values (tests have
-been done with values from 6 to 9)
-
-They would have to use following template :
-
-if (skb->sk && skb->sk->sk_pacing_shift != MY_PACING_SHIFT)
-     skb->sk->sk_pacing_shift = MY_PACING_SHIFT;
-
-Ref: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1670041
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Cc: Johannes Berg <johannes.berg@intel.com>
-Cc: Toke Høiland-Jørgensen <toke@toke.dk>
-Cc: Kir Kolyshkin <kir@openvz.org>
----
---- a/include/net/sock.h
-+++ b/include/net/sock.h
-@@ -267,6 +267,7 @@ struct sock_common {
-   *   @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4)
-   *   @sk_gso_max_size: Maximum GSO segment size to build
-   *   @sk_gso_max_segs: Maximum number of GSO segments
-+  *   @sk_pacing_shift: scaling factor for TCP Small Queues
-   *   @sk_lingertime: %SO_LINGER l_linger setting
-   *   @sk_backlog: always used with the per-socket spinlock held
-   *   @sk_callback_lock: used with the callbacks in the end of this struct
-@@ -446,6 +447,8 @@ struct sock {
-                               sk_type      : 16;
- #define SK_PROTOCOL_MAX U8_MAX
-       u16                     sk_gso_max_segs;
-+#define sk_pacing_shift sk_pacing_shift /* for backport checks */
-+      u8                      sk_pacing_shift;
-       unsigned long           sk_lingertime;
-       struct proto            *sk_prot_creator;
-       rwlock_t                sk_callback_lock;
---- a/net/core/sock.c
-+++ b/net/core/sock.c
-@@ -2750,6 +2750,7 @@ void sock_init_data(struct socket *sock,
-       sk->sk_max_pacing_rate = ~0U;
-       sk->sk_pacing_rate = ~0U;
-+      sk->sk_pacing_shift = 10;
-       sk->sk_incoming_cpu = -1;
-       /*
-        * Before updating sk_refcnt, we must commit prior changes to memory
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -1699,7 +1699,7 @@ u32 tcp_tso_autosize(const struct sock *
- {
-       u32 bytes, segs;
--      bytes = min(sk->sk_pacing_rate >> 10,
-+      bytes = min(sk->sk_pacing_rate >> sk->sk_pacing_shift,
-                   sk->sk_gso_max_size - 1 - MAX_TCP_HEADER);
-       /* Goal is to send at least one packet per ms,
-@@ -2217,7 +2217,7 @@ static bool tcp_small_queue_check(struct
- {
-       unsigned int limit;
--      limit = max(2 * skb->truesize, sk->sk_pacing_rate >> 10);
-+      limit = max(2 * skb->truesize, sk->sk_pacing_rate >> sk->sk_pacing_shift);
-       limit = min_t(u32, limit, sysctl_tcp_limit_output_bytes);
-       limit <<= factor;
diff --git a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
deleted file mode 100644 (file)
index 0e6aa87..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4d304a6fe93538ce356b4593dc43476b50c023e7 Mon Sep 17 00:00:00 2001
-From: Giuseppe Lippolis <giu.lippolis@gmail.com>
-Date: Mon, 23 Apr 2018 09:03:06 +0200
-Subject: USB: serial: option: blacklist unused dwm-158 interfaces
-
-The dwm-158 interface 4 and 5 doesn't answer to the AT commands
-and doesn't appears a option interface.
-Tested on openwrt distribution (kernel 4.14 using the old blacklist
-definitions).
-
-Lars Melin also writes:
-
-       Blacklisting interface 4 and 5 is correct because:
-
-       MI_00 D-Link Mobile Broadband Device  (cdc_ether)
-       MI_02 D-Link HSPA+DataCard Diagnostics Interface (also ppp modem)
-       MI_03 D-Link HSPA+DataCard NMEA Device
-       MI_04 D-Link HSPA+DataCard Speech Port
-       MI_05 D-Link HSPA+DataCard Debug Port
-       MI_06 USB Mass Storage Device
-
-Signed-off-by: Giuseppe Lippolis <giu.lippolis@gmail.com>
-[ johan: add Lars's comment on the interface layout and reword summary ]
-Cc: Lars Melin <larsm17@gmail.com>
-Cc: Dan Williams <dcbw@redhat.com>
-Signed-off-by: Johan Hovold <johan@kernel.org>
----
- drivers/usb/serial/option.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/usb/serial/option.c
-+++ b/drivers/usb/serial/option.c
-@@ -1990,7 +1990,8 @@ static const struct usb_device_id option
-       { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) },                   /* D-Link DWM-156 (variant) */
-       { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) },
-       { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) },
--      { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d04, 0xff) },                   /* D-Link DWM-158 */
-+      { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d04, 0xff),                     /* D-Link DWM-158 */
-+       .driver_info = RSVD(4) | RSVD(5) },
-       { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d0e, 0xff) },                   /* D-Link DWM-157 C1 */
-       { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e19, 0xff),                     /* D-Link DWM-221 B1 */
-         .driver_info = RSVD(4) },
diff --git a/target/linux/generic/backport-4.14/030-v4.17-0001-usb-dwc2-add-support-for-host-mode-external-vbus-sup.patch b/target/linux/generic/backport-4.14/030-v4.17-0001-usb-dwc2-add-support-for-host-mode-external-vbus-sup.patch
deleted file mode 100644 (file)
index 4d029eb..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-From 531ef5ebea96394ddb7f554d4d88e017dde30a59 Mon Sep 17 00:00:00 2001
-From: Amelie Delaunay <amelie.delaunay@st.com>
-Date: Tue, 13 Feb 2018 09:28:12 +0100
-Subject: [PATCH] usb: dwc2: add support for host mode external vbus supply
-
-This patch adds a way to enable an external vbus supply in host mode,
-when dwc2 drvvbus signal is not used.
-
-This patch is very similar to the one done in U-Boot dwc2 driver [1]. It
-also adds dynamic vbus supply management depending on the role and state
-of the core.
-
-[1] https://lists.denx.de/pipermail/u-boot/2017-March/283434.html
-
-Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com>
-Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
----
- drivers/usb/dwc2/core.h |  2 ++
- drivers/usb/dwc2/hcd.c  | 26 ++++++++++++++++++++++++++
- 2 files changed, 28 insertions(+)
-
---- a/drivers/usb/dwc2/core.h
-+++ b/drivers/usb/dwc2/core.h
-@@ -777,6 +777,7 @@ struct dwc2_hregs_backup {
-  * @plat:               The platform specific configuration data. This can be
-  *                      removed once all SoCs support usb transceiver.
-  * @supplies:           Definition of USB power supplies
-+ * @vbus_supply:        Regulator supplying vbus.
-  * @phyif:              PHY interface width
-  * @lock:             Spinlock that protects all the driver data structures
-  * @priv:             Stores a pointer to the struct usb_hcd
-@@ -914,6 +915,7 @@ struct dwc2_hsotg {
-       struct usb_phy *uphy;
-       struct dwc2_hsotg_plat *plat;
-       struct regulator_bulk_data supplies[DWC2_NUM_SUPPLIES];
-+      struct regulator *vbus_supply;
-       u32 phyif;
-       spinlock_t lock;
---- a/drivers/usb/dwc2/hcd.c
-+++ b/drivers/usb/dwc2/hcd.c
-@@ -359,6 +359,23 @@ static void dwc2_gusbcfg_init(struct dwc
-       dwc2_writel(usbcfg, hsotg->regs + GUSBCFG);
- }
-+static int dwc2_vbus_supply_init(struct dwc2_hsotg *hsotg)
-+{
-+      hsotg->vbus_supply = devm_regulator_get_optional(hsotg->dev, "vbus");
-+      if (IS_ERR(hsotg->vbus_supply))
-+              return 0;
-+
-+      return regulator_enable(hsotg->vbus_supply);
-+}
-+
-+static int dwc2_vbus_supply_exit(struct dwc2_hsotg *hsotg)
-+{
-+      if (hsotg->vbus_supply)
-+              return regulator_disable(hsotg->vbus_supply);
-+
-+      return 0;
-+}
-+
- /**
-  * dwc2_enable_host_interrupts() - Enables the Host mode interrupts
-  *
-@@ -3346,6 +3363,7 @@ static void dwc2_conn_id_status_change(s
-       /* B-Device connector (Device Mode) */
-       if (gotgctl & GOTGCTL_CONID_B) {
-+              dwc2_vbus_supply_exit(hsotg);
-               /* Wait for switch to device mode */
-               dev_dbg(hsotg->dev, "connId B\n");
-               if (hsotg->bus_suspended) {
-@@ -4455,6 +4473,9 @@ static int _dwc2_hcd_start(struct usb_hc
-       }
-       spin_unlock_irqrestore(&hsotg->lock, flags);
-+
-+      dwc2_vbus_supply_init(hsotg);
-+
-       return 0;
- }
-@@ -4482,6 +4503,8 @@ static void _dwc2_hcd_stop(struct usb_hc
-       clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
-       spin_unlock_irqrestore(&hsotg->lock, flags);
-+      dwc2_vbus_supply_exit(hsotg);
-+
-       usleep_range(1000, 3000);
- }
-@@ -4518,6 +4541,7 @@ static int _dwc2_hcd_suspend(struct usb_
-               hprt0 |= HPRT0_SUSP;
-               hprt0 &= ~HPRT0_PWR;
-               dwc2_writel(hprt0, hsotg->regs + HPRT0);
-+              dwc2_vbus_supply_exit(hsotg);
-       }
-       /* Enter hibernation */
-@@ -4598,6 +4622,8 @@ static int _dwc2_hcd_resume(struct usb_h
-               spin_unlock_irqrestore(&hsotg->lock, flags);
-               dwc2_port_resume(hsotg);
-       } else {
-+              dwc2_vbus_supply_init(hsotg);
-+
-               /* Wait for controller to correctly update D+/D- level */
-               usleep_range(3000, 5000);
diff --git a/target/linux/generic/backport-4.14/030-v4.17-0002-usb-dwc2-dwc2_vbus_supply_init-fix-error-check.patch b/target/linux/generic/backport-4.14/030-v4.17-0002-usb-dwc2-dwc2_vbus_supply_init-fix-error-check.patch
deleted file mode 100644 (file)
index 02b61fe..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From 438fea2a6325933868aebc20279e2669c9a21207 Mon Sep 17 00:00:00 2001
-From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
-Date: Mon, 26 Mar 2018 11:00:01 +0200
-Subject: [PATCH] usb: dwc2: dwc2_vbus_supply_init: fix error check
-
-devm_regulator_get_optional returns -ENODEV if the regulator isn't
-there, so if that's the case we have to make sure not to leave -ENODEV
-in the regulator pointer.
-
-Also, make sure we return 0 in that case, but correctly propagate any
-other errors. Also propagate the error from _dwc2_hcd_start.
-
-Fixes: 531ef5ebea96 ("usb: dwc2: add support for host mode external vbus supply")
-Cc: Amelie Delaunay <amelie.delaunay@st.com>
-Reviewed-by: Amelie Delaunay <amelie.delaunay@st.com>
-Reviewed-by: Heiko Stuebner <heiko@sntech.de>
-Reviewed-by: Grigor Tovmasyan <tovmasya@synopsys.com>
-Tested-by: Heiko Stuebner <heiko@sntech.de>
-Acked-by: Minas Harutyunyan <hminas@synopsys.com>
-Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
-Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
----
- drivers/usb/dwc2/hcd.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
---- a/drivers/usb/dwc2/hcd.c
-+++ b/drivers/usb/dwc2/hcd.c
-@@ -361,9 +361,14 @@ static void dwc2_gusbcfg_init(struct dwc
- static int dwc2_vbus_supply_init(struct dwc2_hsotg *hsotg)
- {
-+      int ret;
-+
-       hsotg->vbus_supply = devm_regulator_get_optional(hsotg->dev, "vbus");
--      if (IS_ERR(hsotg->vbus_supply))
--              return 0;
-+      if (IS_ERR(hsotg->vbus_supply)) {
-+              ret = PTR_ERR(hsotg->vbus_supply);
-+              hsotg->vbus_supply = NULL;
-+              return ret == -ENODEV ? 0 : ret;
-+      }
-       return regulator_enable(hsotg->vbus_supply);
- }
-@@ -4474,9 +4479,7 @@ static int _dwc2_hcd_start(struct usb_hc
-       spin_unlock_irqrestore(&hsotg->lock, flags);
--      dwc2_vbus_supply_init(hsotg);
--
--      return 0;
-+      return dwc2_vbus_supply_init(hsotg);
- }
- /*
diff --git a/target/linux/generic/backport-4.14/040-v4.17-0001-mtd-move-code-adding-master-MTD-out-of-mtd_add_devic.patch b/target/linux/generic/backport-4.14/040-v4.17-0001-mtd-move-code-adding-master-MTD-out-of-mtd_add_devic.patch
deleted file mode 100644 (file)
index df64297..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-From 2c77c57d22adb05b21cdb333a0c42bdfa0e19835 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 16 Jan 2018 16:45:41 +0100
-Subject: [PATCH] mtd: move code adding master MTD out of
- mtd_add_device_partitions()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This change is a small cleanup of mtd_device_parse_register(). When
-using MTD_PARTITIONED_MASTER it makes sure a master MTD is registered
-before dealing with partitions. The advantage of this is not mixing
-code handling master MTD with code handling partitions.
-
-This commit doesn't change any behavior except from a slightly different
-failure code path. The new code may need to call del_mtd_device when
-something goes wrong.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/mtdcore.c | 25 +++++++++++++------------
- 1 file changed, 13 insertions(+), 12 deletions(-)
-
---- a/drivers/mtd/mtdcore.c
-+++ b/drivers/mtd/mtdcore.c
-@@ -641,20 +641,12 @@ static int mtd_add_device_partitions(str
- {
-       const struct mtd_partition *real_parts = parts->parts;
-       int nbparts = parts->nr_parts;
--      int ret;
--      if (nbparts == 0 || IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER)) {
--              ret = add_mtd_device(mtd);
--              if (ret)
--                      return ret;
--      }
-+      if (!nbparts && !device_is_registered(&mtd->dev))
-+              return add_mtd_device(mtd);
--      if (nbparts > 0) {
--              ret = add_mtd_partitions(mtd, real_parts, nbparts);
--              if (ret && IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER))
--                      del_mtd_device(mtd);
--              return ret;
--      }
-+      if (nbparts > 0)
-+              return add_mtd_partitions(mtd, real_parts, nbparts);
-       return 0;
- }
-@@ -714,6 +706,12 @@ int mtd_device_parse_register(struct mtd
-       mtd_set_dev_defaults(mtd);
-+      if (IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER)) {
-+              ret = add_mtd_device(mtd);
-+              if (ret)
-+                      return ret;
-+      }
-+
-       memset(&parsed, 0, sizeof(parsed));
-       ret = parse_mtd_partitions(mtd, types, &parsed, parser_data);
-@@ -753,6 +751,9 @@ int mtd_device_parse_register(struct mtd
- out:
-       /* Cleanup any parsed partitions */
-       mtd_part_parser_cleanup(&parsed);
-+      if (ret && device_is_registered(&mtd->dev))
-+              del_mtd_device(mtd);
-+
-       return ret;
- }
- EXPORT_SYMBOL_GPL(mtd_device_parse_register);
diff --git a/target/linux/generic/backport-4.14/040-v4.17-0002-mtd-get-rid-of-the-mtd_add_device_partitions.patch b/target/linux/generic/backport-4.14/040-v4.17-0002-mtd-get-rid-of-the-mtd_add_device_partitions.patch
deleted file mode 100644 (file)
index 1042e67..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-From 0dbe4ea78d69756efeb0bba0764f6bd4a9ee9567 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 16 Jan 2018 16:45:42 +0100
-Subject: [PATCH] mtd: get rid of the mtd_add_device_partitions()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This simplifies code a bit by:
-1) Avoiding an extra (tiny) function
-2) Checking for amount of parsed (found) partitions just once
-3) Avoiding clearing/filling struct mtd_partitions manually
-
-With this commit proper functions are called directly from the
-mtd_device_parse_register(). It doesn't need to use minor tricks like
-memsetting struct to 0 to trigger an expected
-mtd_add_device_partitions() behavior.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/mtdcore.c | 43 ++++++++++++-------------------------------
- 1 file changed, 12 insertions(+), 31 deletions(-)
-
---- a/drivers/mtd/mtdcore.c
-+++ b/drivers/mtd/mtdcore.c
-@@ -636,21 +636,6 @@ out_error:
-       return ret;
- }
--static int mtd_add_device_partitions(struct mtd_info *mtd,
--                                   struct mtd_partitions *parts)
--{
--      const struct mtd_partition *real_parts = parts->parts;
--      int nbparts = parts->nr_parts;
--
--      if (!nbparts && !device_is_registered(&mtd->dev))
--              return add_mtd_device(mtd);
--
--      if (nbparts > 0)
--              return add_mtd_partitions(mtd, real_parts, nbparts);
--
--      return 0;
--}
--
- /*
-  * Set a few defaults based on the parent devices, if not provided by the
-  * driver
-@@ -701,7 +686,7 @@ int mtd_device_parse_register(struct mtd
-                             const struct mtd_partition *parts,
-                             int nr_parts)
- {
--      struct mtd_partitions parsed;
-+      struct mtd_partitions parsed = { };
-       int ret;
-       mtd_set_dev_defaults(mtd);
-@@ -712,24 +697,20 @@ int mtd_device_parse_register(struct mtd
-                       return ret;
-       }
--      memset(&parsed, 0, sizeof(parsed));
--
-+      /* Prefer parsed partitions over driver-provided fallback */
-       ret = parse_mtd_partitions(mtd, types, &parsed, parser_data);
--      if ((ret < 0 || parsed.nr_parts == 0) && parts && nr_parts) {
--              /* Fall back to driver-provided partitions */
--              parsed = (struct mtd_partitions){
--                      .parts          = parts,
--                      .nr_parts       = nr_parts,
--              };
--      } else if (ret < 0) {
--              /* Didn't come up with parsed OR fallback partitions */
--              pr_info("mtd: failed to find partitions; one or more parsers reports errors (%d)\n",
--                      ret);
--              /* Don't abort on errors; we can still use unpartitioned MTD */
--              memset(&parsed, 0, sizeof(parsed));
-+      if (!ret && parsed.nr_parts) {
-+              parts = parsed.parts;
-+              nr_parts = parsed.nr_parts;
-       }
--      ret = mtd_add_device_partitions(mtd, &parsed);
-+      if (nr_parts)
-+              ret = add_mtd_partitions(mtd, parts, nr_parts);
-+      else if (!device_is_registered(&mtd->dev))
-+              ret = add_mtd_device(mtd);
-+      else
-+              ret = 0;
-+
-       if (ret)
-               goto out;
diff --git a/target/linux/generic/backport-4.14/041-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch b/target/linux/generic/backport-4.14/041-v4.17-0001-mtd-partitions-add-of_match_table-parser-matching-fo.patch
deleted file mode 100644 (file)
index 765b6b9..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-From 5b644aa012f67fd211138a067b9f351f30bdcc60 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 14 Mar 2018 13:10:42 +0100
-Subject: [PATCH] mtd: partitions: add of_match_table parser matching for the
- "ofpart" type
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In order to properly support compatibility strings as described in the
-bindings/mtd/partition.txt "ofpart" type should be treated as an
-indication for looking into OF. MTD should check "compatible" property
-and search for a matching parser rather than blindly trying the one
-supporting "fixed-partitions".
-
-It also means that existing "fixed-partitions" parser should get renamed
-to use a more meaningful name.
-
-This commit achievies that aim by introducing a new mtd_part_of_parse().
-It works by looking for a matching parser for every string in the
-"compatibility" property (starting with the most specific one).
-
-Please note that driver-specified parsers still take a precedence. It's
-assumed that driver providing a parser type has a good reason for that
-(e.g. having platform data with device-specific info). Also doing
-otherwise could break existing setups. The same applies to using default
-parsers (including "cmdlinepart") as some overwrite DT data with cmdline
-argument.
-
-Partition parsers can now provide an of_match_table to enable
-flash<-->parser matching via device tree as documented in the
-mtd/partition.txt.
-
-This support is currently limited to built-in parsers as it uses
-request_module() and friends. This should be sufficient for most cases
-though as compiling parsers as modules isn't a common choice.
-
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Tested-by: Peter Rosin <peda@axentia.se>
-Reviewed-by: Richard Weinberger <richard@nod.at>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/mtdpart.c          | 116 +++++++++++++++++++++++++++++++++++++----
- include/linux/mtd/partitions.h |   1 +
- 2 files changed, 108 insertions(+), 9 deletions(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -30,6 +30,7 @@
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- #include <linux/err.h>
-+#include <linux/of.h>
- #include "mtdcore.h"
-@@ -919,6 +920,92 @@ static int mtd_part_do_parse(struct mtd_
- }
- /**
-+ * mtd_part_get_compatible_parser - find MTD parser by a compatible string
-+ *
-+ * @compat: compatible string describing partitions in a device tree
-+ *
-+ * MTD parsers can specify supported partitions by providing a table of
-+ * compatibility strings. This function finds a parser that advertises support
-+ * for a passed value of "compatible".
-+ */
-+static struct mtd_part_parser *mtd_part_get_compatible_parser(const char *compat)
-+{
-+      struct mtd_part_parser *p, *ret = NULL;
-+
-+      spin_lock(&part_parser_lock);
-+
-+      list_for_each_entry(p, &part_parsers, list) {
-+              const struct of_device_id *matches;
-+
-+              matches = p->of_match_table;
-+              if (!matches)
-+                      continue;
-+
-+              for (; matches->compatible[0]; matches++) {
-+                      if (!strcmp(matches->compatible, compat) &&
-+                          try_module_get(p->owner)) {
-+                              ret = p;
-+                              break;
-+                      }
-+              }
-+
-+              if (ret)
-+                      break;
-+      }
-+
-+      spin_unlock(&part_parser_lock);
-+
-+      return ret;
-+}
-+
-+static int mtd_part_of_parse(struct mtd_info *master,
-+                           struct mtd_partitions *pparts)
-+{
-+      struct mtd_part_parser *parser;
-+      struct device_node *np;
-+      struct property *prop;
-+      const char *compat;
-+      const char *fixed = "ofpart";
-+      int ret, err = 0;
-+
-+      np = of_get_child_by_name(mtd_get_of_node(master), "partitions");
-+      of_property_for_each_string(np, "compatible", prop, compat) {
-+              parser = mtd_part_get_compatible_parser(compat);
-+              if (!parser)
-+                      continue;
-+              ret = mtd_part_do_parse(parser, master, pparts, NULL);
-+              if (ret > 0) {
-+                      of_node_put(np);
-+                      return ret;
-+              }
-+              mtd_part_parser_put(parser);
-+              if (ret < 0 && !err)
-+                      err = ret;
-+      }
-+      of_node_put(np);
-+
-+      /*
-+       * For backward compatibility we have to try the "ofpart"
-+       * parser. It supports old DT format with partitions specified as a
-+       * direct subnodes of a flash device DT node without any compatibility
-+       * specified we could match.
-+       */
-+      parser = mtd_part_parser_get(fixed);
-+      if (!parser && !request_module("%s", fixed))
-+              parser = mtd_part_parser_get(fixed);
-+      if (parser) {
-+              ret = mtd_part_do_parse(parser, master, pparts, NULL);
-+              if (ret > 0)
-+                      return ret;
-+              mtd_part_parser_put(parser);
-+              if (ret < 0 && !err)
-+                      err = ret;
-+      }
-+
-+      return err;
-+}
-+
-+/**
-  * parse_mtd_partitions - parse MTD partitions
-  * @master: the master partition (describes whole MTD device)
-  * @types: names of partition parsers to try or %NULL
-@@ -950,19 +1037,30 @@ int parse_mtd_partitions(struct mtd_info
-               types = default_mtd_part_types;
-       for ( ; *types; types++) {
--              pr_debug("%s: parsing partitions %s\n", master->name, *types);
--              parser = mtd_part_parser_get(*types);
--              if (!parser && !request_module("%s", *types))
-+              /*
-+               * ofpart is a special type that means OF partitioning info
-+               * should be used. It requires a bit different logic so it is
-+               * handled in a separated function.
-+               */
-+              if (!strcmp(*types, "ofpart")) {
-+                      ret = mtd_part_of_parse(master, pparts);
-+              } else {
-+                      pr_debug("%s: parsing partitions %s\n", master->name,
-+                               *types);
-                       parser = mtd_part_parser_get(*types);
--              pr_debug("%s: got parser %s\n", master->name,
--                       parser ? parser->name : NULL);
--              if (!parser)
--                      continue;
--              ret = mtd_part_do_parse(parser, master, pparts, data);
-+                      if (!parser && !request_module("%s", *types))
-+                              parser = mtd_part_parser_get(*types);
-+                      pr_debug("%s: got parser %s\n", master->name,
-+                              parser ? parser->name : NULL);
-+                      if (!parser)
-+                              continue;
-+                      ret = mtd_part_do_parse(parser, master, pparts, data);
-+                      if (ret <= 0)
-+                              mtd_part_parser_put(parser);
-+              }
-               /* Found partitions! */
-               if (ret > 0)
-                       return 0;
--              mtd_part_parser_put(parser);
-               /*
-                * Stash the first error we see; only report it if no parser
-                * succeeds
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -77,6 +77,7 @@ struct mtd_part_parser {
-       struct list_head list;
-       struct module *owner;
-       const char *name;
-+      const struct of_device_id *of_match_table;
-       int (*parse_fn)(struct mtd_info *, const struct mtd_partition **,
-                       struct mtd_part_parser_data *);
-       void (*cleanup)(const struct mtd_partition *pparts, int nr_parts);
diff --git a/target/linux/generic/backport-4.14/041-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch b/target/linux/generic/backport-4.14/041-v4.17-0002-mtd-rename-ofpart-parser-to-fixed-partitions-as-it-f.patch
deleted file mode 100644 (file)
index 22ad40b..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-From c0faf43482e7f7dfb6d61847cb93d17748560b24 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 14 Mar 2018 13:10:43 +0100
-Subject: [PATCH] mtd: rename "ofpart" parser to "fixed-partitions" as it fits
- it better
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Type "ofpart" means that OF should be used to get partitioning info and
-this driver supports "fixed-partitions" binding only. Renaming it should
-lead to less confusion especially when parsers for new compatibility
-strings start to appear.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Reviewed-by: Richard Weinberger <richard@nod.at>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/mtdpart.c |  4 ++--
- drivers/mtd/ofpart.c  | 11 ++++++-----
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -965,7 +965,7 @@ static int mtd_part_of_parse(struct mtd_
-       struct device_node *np;
-       struct property *prop;
-       const char *compat;
--      const char *fixed = "ofpart";
-+      const char *fixed = "fixed-partitions";
-       int ret, err = 0;
-       np = of_get_child_by_name(mtd_get_of_node(master), "partitions");
-@@ -985,7 +985,7 @@ static int mtd_part_of_parse(struct mtd_
-       of_node_put(np);
-       /*
--       * For backward compatibility we have to try the "ofpart"
-+       * For backward compatibility we have to try the "fixed-partitions"
-        * parser. It supports old DT format with partitions specified as a
-        * direct subnodes of a flash device DT node without any compatibility
-        * specified we could match.
---- a/drivers/mtd/ofpart.c
-+++ b/drivers/mtd/ofpart.c
-@@ -25,9 +25,9 @@ static bool node_has_compatible(struct d
-       return of_get_property(pp, "compatible", NULL);
- }
--static int parse_ofpart_partitions(struct mtd_info *master,
--                                 const struct mtd_partition **pparts,
--                                 struct mtd_part_parser_data *data)
-+static int parse_fixed_partitions(struct mtd_info *master,
-+                                const struct mtd_partition **pparts,
-+                                struct mtd_part_parser_data *data)
- {
-       struct mtd_partition *parts;
-       struct device_node *mtd_node;
-@@ -141,8 +141,8 @@ ofpart_none:
- }
- static struct mtd_part_parser ofpart_parser = {
--      .parse_fn = parse_ofpart_partitions,
--      .name = "ofpart",
-+      .parse_fn = parse_fixed_partitions,
-+      .name = "fixed-partitions",
- };
- static int parse_ofoldpart_partitions(struct mtd_info *master,
-@@ -229,4 +229,5 @@ MODULE_AUTHOR("Vitaly Wool, David Gibson
-  * with the same name. Since we provide the ofoldpart parser, we should have
-  * the corresponding alias.
-  */
-+MODULE_ALIAS("fixed-partitions");
- MODULE_ALIAS("ofoldpart");
diff --git a/target/linux/generic/backport-4.14/041-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch b/target/linux/generic/backport-4.14/041-v4.17-0003-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch
deleted file mode 100644 (file)
index d6958c3..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From 97b0c7c0df3efd7048ed39d7e2dee34cafd55887 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 14 Mar 2018 13:10:44 +0100
-Subject: [PATCH] mtd: ofpart: add of_match_table with "fixed-partitions"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allows using this parser with any flash driver that takes care of
-setting of_node (using mtd_set_of_node helper) correctly. Up to now
-support for "fixed-partitions" DT compatibility string was working only
-with flash drivers that were specifying "ofpart" (manually or by letting
-mtd use the default set of parsers).
-
-This matches existing bindings documentation.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Reviewed-by: Brian Norris <computersforpeace@gmail.com>
-Tested-by: Brian Norris <computersforpeace@gmail.com>
-Reviewed-by: Richard Weinberger <richard@nod.at>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/ofpart.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/mtd/ofpart.c
-+++ b/drivers/mtd/ofpart.c
-@@ -140,9 +140,16 @@ ofpart_none:
-       return ret;
- }
-+static const struct of_device_id parse_ofpart_match_table[] = {
-+      { .compatible = "fixed-partitions" },
-+      {},
-+};
-+MODULE_DEVICE_TABLE(of, parse_ofpart_match_table);
-+
- static struct mtd_part_parser ofpart_parser = {
-       .parse_fn = parse_fixed_partitions,
-       .name = "fixed-partitions",
-+      .of_match_table = parse_ofpart_match_table,
- };
- static int parse_ofoldpart_partitions(struct mtd_info *master,
diff --git a/target/linux/generic/backport-4.14/042-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch b/target/linux/generic/backport-4.14/042-v4.18-0001-mtd-move-code-adding-registering-partitions-to-the-p.patch
deleted file mode 100644 (file)
index d017fd4..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-From 5ac67ce36cfe38b4c104a42ce52c5c8d526f1c95 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 27 Mar 2018 22:35:41 +0200
-Subject: [PATCH] mtd: move code adding (registering) partitions to the
- parse_mtd_partitions()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This commit slightly simplifies the code. Every parse_mtd_partitions()
-caller (out of two existing ones) had to add partitions & cleanup parser
-on its own. This moves that responsibility into the function.
-
-That change also allows dropping struct mtd_partitions argument.
-
-There is one minor behavior change caused by this cleanup. If
-parse_mtd_partitions() fails to add partitions (add_mtd_partitions()
-return an error) then mtd_device_parse_register() will still try to
-add (register) fallback partitions. It's a real corner case affecting
-one of uncommon error paths and shouldn't cause any harm.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/mtdcore.c | 14 ++++----------
- drivers/mtd/mtdcore.h |  1 -
- drivers/mtd/mtdpart.c | 44 ++++++++++++++++----------------------------
- 3 files changed, 20 insertions(+), 39 deletions(-)
-
---- a/drivers/mtd/mtdcore.c
-+++ b/drivers/mtd/mtdcore.c
-@@ -686,7 +686,6 @@ int mtd_device_parse_register(struct mtd
-                             const struct mtd_partition *parts,
-                             int nr_parts)
- {
--      struct mtd_partitions parsed = { };
-       int ret;
-       mtd_set_dev_defaults(mtd);
-@@ -698,13 +697,10 @@ int mtd_device_parse_register(struct mtd
-       }
-       /* Prefer parsed partitions over driver-provided fallback */
--      ret = parse_mtd_partitions(mtd, types, &parsed, parser_data);
--      if (!ret && parsed.nr_parts) {
--              parts = parsed.parts;
--              nr_parts = parsed.nr_parts;
--      }
--
--      if (nr_parts)
-+      ret = parse_mtd_partitions(mtd, types, parser_data);
-+      if (ret > 0)
-+              ret = 0;
-+      else if (nr_parts)
-               ret = add_mtd_partitions(mtd, parts, nr_parts);
-       else if (!device_is_registered(&mtd->dev))
-               ret = add_mtd_device(mtd);
-@@ -730,8 +726,6 @@ int mtd_device_parse_register(struct mtd
-       }
- out:
--      /* Cleanup any parsed partitions */
--      mtd_part_parser_cleanup(&parsed);
-       if (ret && device_is_registered(&mtd->dev))
-               del_mtd_device(mtd);
---- a/drivers/mtd/mtdcore.h
-+++ b/drivers/mtd/mtdcore.h
-@@ -15,7 +15,6 @@ int del_mtd_partitions(struct mtd_info *
- struct mtd_partitions;
- int parse_mtd_partitions(struct mtd_info *master, const char * const *types,
--                       struct mtd_partitions *pparts,
-                        struct mtd_part_parser_data *data);
- void mtd_part_parser_cleanup(struct mtd_partitions *parts);
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -383,20 +383,7 @@ static inline void free_partition(struct
-  */
- static int mtd_parse_part(struct mtd_part *slave, const char *const *types)
- {
--      struct mtd_partitions parsed;
--      int err;
--
--      err = parse_mtd_partitions(&slave->mtd, types, &parsed, NULL);
--      if (err)
--              return err;
--      else if (!parsed.nr_parts)
--              return -ENOENT;
--
--      err = add_mtd_partitions(&slave->mtd, parsed.parts, parsed.nr_parts);
--
--      mtd_part_parser_cleanup(&parsed);
--
--      return err;
-+      return parse_mtd_partitions(&slave->mtd, types, NULL);
- }
- static struct mtd_part *allocate_partition(struct mtd_info *parent,
-@@ -1006,30 +993,27 @@ static int mtd_part_of_parse(struct mtd_
- }
- /**
-- * parse_mtd_partitions - parse MTD partitions
-+ * parse_mtd_partitions - parse and register MTD partitions
-+ *
-  * @master: the master partition (describes whole MTD device)
-  * @types: names of partition parsers to try or %NULL
-- * @pparts: info about partitions found is returned here
-  * @data: MTD partition parser-specific data
-  *
-- * This function tries to find partition on MTD device @master. It uses MTD
-- * partition parsers, specified in @types. However, if @types is %NULL, then
-- * the default list of parsers is used. The default list contains only the
-+ * This function tries to find & register partitions on MTD device @master. It
-+ * uses MTD partition parsers, specified in @types. However, if @types is %NULL,
-+ * then the default list of parsers is used. The default list contains only the
-  * "cmdlinepart" and "ofpart" parsers ATM.
-  * Note: If there are more then one parser in @types, the kernel only takes the
-  * partitions parsed out by the first parser.
-  *
-  * This function may return:
-  * o a negative error code in case of failure
-- * o zero otherwise, and @pparts will describe the partitions, number of
-- *   partitions, and the parser which parsed them. Caller must release
-- *   resources with mtd_part_parser_cleanup() when finished with the returned
-- *   data.
-+ * o number of found partitions otherwise
-  */
- int parse_mtd_partitions(struct mtd_info *master, const char *const *types,
--                       struct mtd_partitions *pparts,
-                        struct mtd_part_parser_data *data)
- {
-+      struct mtd_partitions pparts = { };
-       struct mtd_part_parser *parser;
-       int ret, err = 0;
-@@ -1043,7 +1027,7 @@ int parse_mtd_partitions(struct mtd_info
-                * handled in a separated function.
-                */
-               if (!strcmp(*types, "ofpart")) {
--                      ret = mtd_part_of_parse(master, pparts);
-+                      ret = mtd_part_of_parse(master, &pparts);
-               } else {
-                       pr_debug("%s: parsing partitions %s\n", master->name,
-                                *types);
-@@ -1054,13 +1038,17 @@ int parse_mtd_partitions(struct mtd_info
-                               parser ? parser->name : NULL);
-                       if (!parser)
-                               continue;
--                      ret = mtd_part_do_parse(parser, master, pparts, data);
-+                      ret = mtd_part_do_parse(parser, master, &pparts, data);
-                       if (ret <= 0)
-                               mtd_part_parser_put(parser);
-               }
-               /* Found partitions! */
--              if (ret > 0)
--                      return 0;
-+              if (ret > 0) {
-+                      err = add_mtd_partitions(master, pparts.parts,
-+                                               pparts.nr_parts);
-+                      mtd_part_parser_cleanup(&pparts);
-+                      return err ? err : pparts.nr_parts;
-+              }
-               /*
-                * Stash the first error we see; only report it if no parser
-                * succeeds
diff --git a/target/linux/generic/backport-4.14/043-v4.18-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch b/target/linux/generic/backport-4.14/043-v4.18-mtd-bcm47xxpart-improve-handling-TRX-partition-size.patch
deleted file mode 100644 (file)
index e08f8da..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From 237ea0d4762cc14d0fc80e80d61f0f08e1050c7f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 12 Apr 2018 07:24:52 +0200
-Subject: [PATCH] mtd: bcm47xxpart: improve handling TRX partition size
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When bcm47xxpart finds a TRX partition (container) it's supposed to jump
-to the end of it and keep looking for more partitions. TRX and its
-subpartitions are handled by a separate parser.
-
-The problem with old code was relying on the length specified in a TRX
-header. That isn't reliable as TRX is commonly modified to have checksum
-cover only non-changing subpartitions. Otherwise modifying e.g. a rootfs
-would result in CRC32 mismatch and bootloader refusing to boot a
-firmware.
-
-Fix it by trying better to figure out a real TRX size. We can securely
-assume that TRX has to cover all subpartitions and the last one is at
-least of a block size in size. Then compare it with a length field.
-
-This makes code more optimal & reliable thanks to skipping data that
-shouldn't be parsed.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/bcm47xxpart.c | 22 ++++++++++++++++++----
- 1 file changed, 18 insertions(+), 4 deletions(-)
-
---- a/drivers/mtd/bcm47xxpart.c
-+++ b/drivers/mtd/bcm47xxpart.c
-@@ -186,6 +186,8 @@ static int bcm47xxpart_parse(struct mtd_
-               /* TRX */
-               if (buf[0x000 / 4] == TRX_MAGIC) {
-                       struct trx_header *trx;
-+                      uint32_t last_subpart;
-+                      uint32_t trx_size;
-                       if (trx_num >= ARRAY_SIZE(trx_parts))
-                               pr_warn("No enough space to store another TRX found at 0x%X\n",
-@@ -195,11 +197,23 @@ static int bcm47xxpart_parse(struct mtd_
-                       bcm47xxpart_add_part(&parts[curr_part++], "firmware",
-                                            offset, 0);
--                      /* Jump to the end of TRX */
-+                      /*
-+                       * Try to find TRX size. The "length" field isn't fully
-+                       * reliable as it could be decreased to make CRC32 cover
-+                       * only part of TRX data. It's commonly used as checksum
-+                       * can't cover e.g. ever-changing rootfs partition.
-+                       * Use offsets as helpers for assuming min TRX size.
-+                       */
-                       trx = (struct trx_header *)buf;
--                      offset = roundup(offset + trx->length, blocksize);
--                      /* Next loop iteration will increase the offset */
--                      offset -= blocksize;
-+                      last_subpart = max3(trx->offset[0], trx->offset[1],
-+                                          trx->offset[2]);
-+                      trx_size = max(trx->length, last_subpart + blocksize);
-+
-+                      /*
-+                       * Skip the TRX data. Decrease offset by block size as
-+                       * the next loop iteration will increase it.
-+                       */
-+                      offset += roundup(trx_size, blocksize) - blocksize;
-                       continue;
-               }
diff --git a/target/linux/generic/backport-4.14/044-v4.18-mtd-bcm47xxpart-add-of_match_table-with-a-new-DT-bin.patch b/target/linux/generic/backport-4.14/044-v4.18-mtd-bcm47xxpart-add-of_match_table-with-a-new-DT-bin.patch
deleted file mode 100644 (file)
index de0ff1f..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-From cf589ce71e84d3b8811c65740645af254c5248c0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 9 May 2018 10:17:29 +0200
-Subject: [PATCH] mtd: bcm47xxpart: add of_match_table with a new DT binding
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allows using bcm47xxpart parser to find partitions on flash
-described in DT using the "brcm,bcm947xx-cfe-partitions" compatible
-property. It means this parser doesn't have to be explicitly selected by
-a flash driver anymore. It can be used e.g. together with a generic
-m25p80 / spi-nor if device is just properly described.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/bcm47xxpart.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/mtd/bcm47xxpart.c
-+++ b/drivers/mtd/bcm47xxpart.c
-@@ -304,9 +304,16 @@ static int bcm47xxpart_parse(struct mtd_
-       return curr_part;
- };
-+static const struct of_device_id bcm47xxpart_of_match_table[] = {
-+      { .compatible = "brcm,bcm947xx-cfe-partitions" },
-+      {},
-+};
-+MODULE_DEVICE_TABLE(of, bcm47xxpart_of_match_table);
-+
- static struct mtd_part_parser bcm47xxpart_mtd_parser = {
-       .parse_fn = bcm47xxpart_parse,
-       .name = "bcm47xxpart",
-+      .of_match_table = bcm47xxpart_of_match_table,
- };
- module_mtd_part_parser(bcm47xxpart_mtd_parser);
diff --git a/target/linux/generic/backport-4.14/045-v4.19-mtd-parsers-trx-add-of_match_table-with-the-new-DT-b.patch b/target/linux/generic/backport-4.14/045-v4.19-mtd-parsers-trx-add-of_match_table-with-the-new-DT-b.patch
deleted file mode 100644 (file)
index 5841dd5..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From 98534a58c8a40cdc9e3bcb04d74719fbcedfeb52 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 26 Jun 2018 00:05:08 +0200
-Subject: [PATCH] mtd: parsers: trx: add of_match_table with the new DT binding
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allows using TRX parser to find TRX partitions on flash device
-described in DT using a proper binding. It's useful for devices storing
-firmware on a separated flash and having rootfs partition in it.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/parsers/parser_trx.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/mtd/parsers/parser_trx.c
-+++ b/drivers/mtd/parsers/parser_trx.c
-@@ -116,9 +116,16 @@ static int parser_trx_parse(struct mtd_i
-       return i;
- };
-+static const struct of_device_id mtd_parser_trx_of_match_table[] = {
-+      { .compatible = "brcm,trx" },
-+      {},
-+};
-+MODULE_DEVICE_TABLE(of, mtd_parser_trx_of_match_table);
-+
- static struct mtd_part_parser mtd_parser_trx = {
-       .parse_fn = parser_trx_parse,
-       .name = "trx",
-+      .of_match_table = mtd_parser_trx_of_match_table,
- };
- module_mtd_part_parser(mtd_parser_trx);
diff --git a/target/linux/generic/backport-4.14/046-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch b/target/linux/generic/backport-4.14/046-v4.19-mtd-partitions-use-DT-info-for-parsing-partitions-wi.patch
deleted file mode 100644 (file)
index eff1a01..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-From 76a832254ab05502c9394cc51ded6f0abe0e0bee Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Fri, 13 Jul 2018 16:32:21 +0200
-Subject: [PATCH] mtd: partitions: use DT info for parsing partitions with
- "compatible" prop
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-So far only flash devices could be described in DT regarding partitions
-parsing. That could be done with "partitions" subnode and a proper
-"compatible" string.
-
-Some devices may use hierarchical (multi-level) layouts and may mix used
-layouts (fixed and dynamic). Describing that in DT is done by specifying
-"compatible" for DT-represented partition plus optionally more
-properties and/or subnodes.
-
-To support such layouts each DT partition has to be checked for
-additional description.
-
-Please note this implementation will work in parallel with support for
-partition type specified for non-DT setups. That already works since
-commit 1a0915be1926 ("mtd: partitions: add support for partition
-parsers").
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/mtdpart.c | 33 +++++++++++++--------------------
- 1 file changed, 13 insertions(+), 20 deletions(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -370,22 +370,6 @@ static inline void free_partition(struct
-       kfree(p);
- }
--/**
-- * mtd_parse_part - parse MTD partition looking for subpartitions
-- *
-- * @slave: part that is supposed to be a container and should be parsed
-- * @types: NULL-terminated array with names of partition parsers to try
-- *
-- * Some partitions are kind of containers with extra subpartitions (volumes).
-- * There can be various formats of such containers. This function tries to use
-- * specified parsers to analyze given partition and registers found
-- * subpartitions on success.
-- */
--static int mtd_parse_part(struct mtd_part *slave, const char *const *types)
--{
--      return parse_mtd_partitions(&slave->mtd, types, NULL);
--}
--
- static struct mtd_part *allocate_partition(struct mtd_info *parent,
-                       const struct mtd_partition *part, int partno,
-                       uint64_t cur_offset)
-@@ -803,8 +787,8 @@ int add_mtd_partitions(struct mtd_info *
-               }
-               mtd_add_partition_attrs(slave);
--              if (parts[i].types)
--                      mtd_parse_part(slave, parts[i].types);
-+              /* Look for subpartitions */
-+              parse_mtd_partitions(&slave->mtd, parts[i].types, NULL);
-               cur_offset = slave->offset + slave->mtd.size;
-       }
-@@ -885,6 +869,12 @@ static const char * const default_mtd_pa
-       NULL
- };
-+/* Check DT only when looking for subpartitions. */
-+static const char * const default_subpartition_types[] = {
-+      "ofpart",
-+      NULL
-+};
-+
- static int mtd_part_do_parse(struct mtd_part_parser *parser,
-                            struct mtd_info *master,
-                            struct mtd_partitions *pparts,
-@@ -955,7 +945,9 @@ static int mtd_part_of_parse(struct mtd_
-       const char *fixed = "fixed-partitions";
-       int ret, err = 0;
--      np = of_get_child_by_name(mtd_get_of_node(master), "partitions");
-+      np = mtd_get_of_node(master);
-+      if (!mtd_is_partition(master))
-+              np = of_get_child_by_name(np, "partitions");
-       of_property_for_each_string(np, "compatible", prop, compat) {
-               parser = mtd_part_get_compatible_parser(compat);
-               if (!parser)
-@@ -1018,7 +1010,8 @@ int parse_mtd_partitions(struct mtd_info
-       int ret, err = 0;
-       if (!types)
--              types = default_mtd_part_types;
-+              types = mtd_is_partition(master) ? default_subpartition_types :
-+                      default_mtd_part_types;
-       for ( ; *types; types++) {
-               /*
diff --git a/target/linux/generic/backport-4.14/047-v4.21-mtd-keep-original-flags-for-every-struct-mtd_info.patch b/target/linux/generic/backport-4.14/047-v4.21-mtd-keep-original-flags-for-every-struct-mtd_info.patch
deleted file mode 100644 (file)
index 7f90cf9..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From 1186af457cc186c5ed01708da71b1ffbdf0a2638 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 20 Nov 2018 09:55:45 +0100
-Subject: [PATCH] mtd: keep original flags for every struct mtd_info
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When allocating a new partition mtd subsystem runs internal tests in the
-allocate_partition(). They may result in modifying specified flags (e.g.
-dropping some /features/ like write access).
-
-Those constraints don't have to be necessary true for subpartitions. It
-may happen parent partition isn't block aligned (effectively disabling
-write access) while subpartition may fit blocks nicely. In such case all
-checks should be run again (starting with original flags value).
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/mtdcore.c   | 2 ++
- drivers/mtd/mtdpart.c   | 3 ++-
- include/linux/mtd/mtd.h | 1 +
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
---- a/drivers/mtd/mtdcore.c
-+++ b/drivers/mtd/mtdcore.c
-@@ -650,6 +650,8 @@ static void mtd_set_dev_defaults(struct
-       } else {
-               pr_debug("mtd device won't show a device symlink in sysfs\n");
-       }
-+
-+      mtd->orig_flags = mtd->flags;
- }
- /**
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -394,7 +394,8 @@ static struct mtd_part *allocate_partiti
-       /* set up the MTD object for this partition */
-       slave->mtd.type = parent->type;
--      slave->mtd.flags = parent->flags & ~part->mask_flags;
-+      slave->mtd.flags = parent->orig_flags & ~part->mask_flags;
-+      slave->mtd.orig_flags = slave->mtd.flags;
-       slave->mtd.size = part->size;
-       slave->mtd.writesize = parent->writesize;
-       slave->mtd.writebufsize = parent->writebufsize;
---- a/include/linux/mtd/mtd.h
-+++ b/include/linux/mtd/mtd.h
-@@ -218,6 +218,7 @@ struct mtd_debug_info {
- struct mtd_info {
-       u_char type;
-       uint32_t flags;
-+      uint32_t orig_flags; /* Flags as before running mtd checks */
-       uint64_t size;   // Total size of the MTD
-       /* "Major" erase size for the device. Naïve users may take this
diff --git a/target/linux/generic/backport-4.14/048-v4.21-mtd-improve-calculating-partition-boundaries-when-ch.patch b/target/linux/generic/backport-4.14/048-v4.21-mtd-improve-calculating-partition-boundaries-when-ch.patch
deleted file mode 100644 (file)
index 58163e6..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6750f61a13a0197c40e4a40739117493b15f19e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Tue, 20 Nov 2018 10:24:09 +0100
-Subject: [PATCH] mtd: improve calculating partition boundaries when checking
- for alignment
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When checking for alignment mtd should check absolute offsets. It's
-important for subpartitions as it doesn't make sense to check their
-relative addresses.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
----
- drivers/mtd/mtdpart.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
---- a/drivers/mtd/mtdpart.c
-+++ b/drivers/mtd/mtdpart.c
-@@ -61,6 +61,15 @@ static inline struct mtd_part *mtd_to_pa
-       return container_of(mtd, struct mtd_part, mtd);
- }
-+static u64 part_absolute_offset(struct mtd_info *mtd)
-+{
-+      struct mtd_part *part = mtd_to_part(mtd);
-+
-+      if (!mtd_is_partition(mtd))
-+              return 0;
-+
-+      return part_absolute_offset(part->parent) + part->offset;
-+}
- /*
-  * MTD methods which simply translate the effective address and pass through
-@@ -562,7 +571,7 @@ static struct mtd_part *allocate_partiti
-       if (!(slave->mtd.flags & MTD_NO_ERASE))
-               wr_alignment = slave->mtd.erasesize;
--      tmp = slave->offset;
-+      tmp = part_absolute_offset(parent) + slave->offset;
-       remainder = do_div(tmp, wr_alignment);
-       if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
-               /* Doesn't start on a boundary of major erase size */
-@@ -573,7 +582,7 @@ static struct mtd_part *allocate_partiti
-                       part->name);
-       }
--      tmp = slave->mtd.size;
-+      tmp = part_absolute_offset(parent) + slave->mtd.size;
-       remainder = do_div(tmp, wr_alignment);
-       if ((slave->mtd.flags & MTD_WRITEABLE) && remainder) {
-               slave->mtd.flags &= ~MTD_WRITEABLE;
diff --git a/target/linux/generic/backport-4.14/050-v4.19-f2fs-skip-verifying-block-address-non-regular-inode.patch b/target/linux/generic/backport-4.14/050-v4.19-f2fs-skip-verifying-block-address-non-regular-inode.patch
deleted file mode 100644 (file)
index 65ab16a..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-From dda9f4b9cac6bdd2a96253b4444d7a6ce5132edb Mon Sep 17 00:00:00 2001
-From: Chao Yu <yuchao0@huawei.com>
-Date: Sat, 11 Aug 2018 23:42:09 +0800
-Subject: f2fs: fix to skip verifying block address for non-regular inode
-
-generic/184 1s ... [failed, exit status 1]- output mismatch
-    --- tests/generic/184.out  2015-01-11 16:52:27.643681072 +0800
-     QA output created by 184 - silence is golden
-    +rm: cannot remove '/mnt/f2fs/null': Bad address
-    +mknod: '/mnt/f2fs/null': Bad address
-    +chmod: cannot access '/mnt/f2fs/null': Bad address
-    +./tests/generic/184: line 36: /mnt/f2fs/null: Bad address
-    ...
-
-F2FS-fs (zram0): access invalid blkaddr:259
-EIP: f2fs_is_valid_blkaddr+0x14b/0x1b0 [f2fs]
- f2fs_iget+0x927/0x1010 [f2fs]
- f2fs_lookup+0x26e/0x630 [f2fs]
- __lookup_slow+0xb3/0x140
- lookup_slow+0x31/0x50
- walk_component+0x185/0x1f0
- path_lookupat+0x51/0x190
- filename_lookup+0x7f/0x140
- user_path_at_empty+0x36/0x40
- vfs_statx+0x61/0xc0
- __do_sys_stat64+0x29/0x40
- sys_stat64+0x13/0x20
- do_fast_syscall_32+0xaa/0x22c
- entry_SYSENTER_32+0x53/0x86
-
-In f2fs_iget(), we will check inode's first block address, if it is valid,
-we will set FI_FIRST_BLOCK_WRITTEN flag in inode.
-
-But we should only do this for regular inode, otherwise, like special
-inode, i_addr[0] is used for storing device info instead of block address,
-it will fail checking flow obviously.
-
-So for non-regular inode, let's skip verifying address and setting flag.
-
-Signed-off-by: Chao Yu <yuchao0@huawei.com>
-Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
----
- fs/f2fs/inode.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
---- a/fs/f2fs/inode.c
-+++ b/fs/f2fs/inode.c
-@@ -310,13 +310,15 @@ static int do_read_inode(struct inode *i
-       /* get rdev by using inline_info */
-       __get_inode_rdev(inode, ri);
--      err = __written_first_block(sbi, ri);
--      if (err < 0) {
--              f2fs_put_page(node_page, 1);
--              return err;
-+      if (S_ISREG(inode->i_mode)) {
-+              err = __written_first_block(sbi, ri);
-+              if (err < 0) {
-+                      f2fs_put_page(node_page, 1);
-+                      return err;
-+              }
-+              if (!err)
-+                      set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);
-       }
--      if (!err)
--              set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);
-       if (!need_inode_block_update(sbi, inode->i_ino))
-               fi->last_disk_size = inode->i_size;
diff --git a/target/linux/generic/backport-4.14/071-v4.15-0001-net-bgmac-enable-master-mode-for-BCM54210E-and-B5021.patch b/target/linux/generic/backport-4.14/071-v4.15-0001-net-bgmac-enable-master-mode-for-BCM54210E-and-B5021.patch
deleted file mode 100644 (file)
index db239e0..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-From 12acd136913ccdf394eeb2bc8686ff5505368119 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 12 Oct 2017 10:21:26 +0200
-Subject: [PATCH] net: bgmac: enable master mode for BCM54210E and B50212E PHYs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There are 4 very similar PHYs:
-0x600d84a1: BCM54210E (rev B0)
-0x600d84a2: BCM54210E (rev B1)
-0x600d84a5: B50212E (rev B0)
-0x600d84a6: B50212E (rev B1)
-that need setting master mode manually. It's because they run in slave
-mode by default with Automatic Slave/Master configuration disabled which
-can lead to unreliable connection with massive ping loss.
-
-So far it was reported for a board with BCM47189 SoC and B50212E B1 PHY
-connected to the bgmac supported ethernet device. Telling PHY driver to
-setup PHY properly solves this issue.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/ethernet/broadcom/bgmac-bcma.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
---- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
-+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
-@@ -184,13 +184,19 @@ static int bgmac_probe(struct bcma_devic
-       if (!bgmac_is_bcm4707_family(core) &&
-           !(ci->id == BCMA_CHIP_ID_BCM53573 && core->core_unit == 1)) {
-+              struct phy_device *phydev;
-+
-               mii_bus = bcma_mdio_mii_register(bgmac);
-               if (IS_ERR(mii_bus)) {
-                       err = PTR_ERR(mii_bus);
-                       goto err;
-               }
--
-               bgmac->mii_bus = mii_bus;
-+
-+              phydev = mdiobus_get_phy(bgmac->mii_bus, bgmac->phyaddr);
-+              if (ci->id == BCMA_CHIP_ID_BCM53573 && phydev &&
-+                  (phydev->drv->phy_id & phydev->drv->phy_id_mask) == PHY_ID_BCM54210E)
-+                      phydev->dev_flags |= PHY_BRCM_EN_MASTER_MODE;
-       }
-       if (core->bus->hosttype == BCMA_HOSTTYPE_PCI) {
diff --git a/target/linux/generic/backport-4.14/076-v4.15-0001-net-phy-broadcom-support-new-device-flag-for-setting.patch b/target/linux/generic/backport-4.14/076-v4.15-0001-net-phy-broadcom-support-new-device-flag-for-setting.patch
deleted file mode 100644 (file)
index a22d272..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 2355a6546a053b1c16ebefd6ce1f0cccc00e1da5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 12 Oct 2017 10:21:25 +0200
-Subject: [PATCH] net: phy: broadcom: support new device flag for setting
- master mode
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some of Broadcom's PHYs run by default in slave mode with Automatic
-Slave/Master configuration disabled. It stops them from working properly
-with some devices.
-
-So far it has been verified for BCM54210E and BCM50212E which don't
-work well with Intel's I217-LM and I218-LM:
-http://ark.intel.com/products/60019/Intel-Ethernet-Connection-I217-LM
-http://ark.intel.com/products/71307/Intel-Ethernet-Connection-I218-LM
-I was told there is massive ping loss.
-
-This commit adds support for a new flag which can be set by an ethernet
-driver to fixup PHY setup.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/phy/broadcom.c | 6 ++++++
- include/linux/brcmphy.h    | 1 +
- 2 files changed, 7 insertions(+)
-
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -43,6 +43,12 @@ static int bcm54210e_config_init(struct
-       val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN;
-       bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val);
-+      if (phydev->dev_flags & PHY_BRCM_EN_MASTER_MODE) {
-+              val = phy_read(phydev, MII_CTRL1000);
-+              val |= CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER;
-+              phy_write(phydev, MII_CTRL1000, val);
-+      }
-+
-       return 0;
- }
---- a/include/linux/brcmphy.h
-+++ b/include/linux/brcmphy.h
-@@ -64,6 +64,7 @@
- #define PHY_BRCM_EXT_IBND_TX_ENABLE   0x00002000
- #define PHY_BRCM_CLEAR_RGMII_MODE     0x00004000
- #define PHY_BRCM_DIS_TXCRXC_NOENRGY   0x00008000
-+#define PHY_BRCM_EN_MASTER_MODE               0x00010000
- /* Broadcom BCM7xxx specific workarounds */
- #define PHY_BRCM_7XXX_REV(x)          (((x) >> 8) & 0xff)
diff --git a/target/linux/generic/backport-4.14/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch b/target/linux/generic/backport-4.14/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch
deleted file mode 100644 (file)
index cc32aee..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-From 5a1c18b761ddb299a06746948b9ec2814b04fa92 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 2 Jan 2019 00:00:01 +0100
-Subject: [PATCH] bcma: keep a direct pointer to the struct device
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Accessing struct device is pretty useful/common so having a direct
-pointer:
-1) Simplifies some code
-2) Makes bcma_bus_get_host_dev() unneeded
-3) Allows further improvements like using dev_* printing helpers
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
----
- drivers/bcma/bcma_private.h |  1 -
- drivers/bcma/driver_gpio.c  |  2 +-
- drivers/bcma/host_pci.c     |  2 ++
- drivers/bcma/host_soc.c     |  4 ++--
- drivers/bcma/main.c         | 45 +++++++++----------------------------
- include/linux/bcma/bcma.h   | 11 +++------
- 6 files changed, 18 insertions(+), 47 deletions(-)
-
---- a/drivers/bcma/bcma_private.h
-+++ b/drivers/bcma/bcma_private.h
-@@ -33,7 +33,6 @@ int __init bcma_bus_early_register(struc
- int bcma_bus_suspend(struct bcma_bus *bus);
- int bcma_bus_resume(struct bcma_bus *bus);
- #endif
--struct device *bcma_bus_get_host_dev(struct bcma_bus *bus);
- /* scan.c */
- void bcma_detect_chip(struct bcma_bus *bus);
---- a/drivers/bcma/driver_gpio.c
-+++ b/drivers/bcma/driver_gpio.c
-@@ -183,7 +183,7 @@ int bcma_gpio_init(struct bcma_drv_cc *c
-       chip->direction_input   = bcma_gpio_direction_input;
-       chip->direction_output  = bcma_gpio_direction_output;
-       chip->owner             = THIS_MODULE;
--      chip->parent            = bcma_bus_get_host_dev(bus);
-+      chip->parent            = bus->dev;
- #if IS_BUILTIN(CONFIG_OF)
-       chip->of_node           = cc->core->dev.of_node;
- #endif
---- a/drivers/bcma/host_pci.c
-+++ b/drivers/bcma/host_pci.c
-@@ -196,6 +196,8 @@ static int bcma_host_pci_probe(struct pc
-               goto err_pci_release_regions;
-       }
-+      bus->dev = &dev->dev;
-+
-       /* Map MMIO */
-       err = -ENOMEM;
-       bus->mmio = pci_iomap(dev, 0, ~0UL);
---- a/drivers/bcma/host_soc.c
-+++ b/drivers/bcma/host_soc.c
-@@ -179,7 +179,6 @@ int __init bcma_host_soc_register(struct
-       /* Host specific */
-       bus->hosttype = BCMA_HOSTTYPE_SOC;
-       bus->ops = &bcma_host_soc_ops;
--      bus->host_pdev = NULL;
-       /* Initialize struct, detect chip */
-       bcma_init_bus(bus);
-@@ -213,6 +212,8 @@ static int bcma_host_soc_probe(struct pl
-       if (!bus)
-               return -ENOMEM;
-+      bus->dev = dev;
-+
-       /* Map MMIO */
-       bus->mmio = of_iomap(np, 0);
-       if (!bus->mmio)
-@@ -221,7 +222,6 @@ static int bcma_host_soc_probe(struct pl
-       /* Host specific */
-       bus->hosttype = BCMA_HOSTTYPE_SOC;
-       bus->ops = &bcma_host_soc_ops;
--      bus->host_pdev = pdev;
-       /* Initialize struct, detect chip */
-       bcma_init_bus(bus);
---- a/drivers/bcma/main.c
-+++ b/drivers/bcma/main.c
-@@ -223,8 +223,8 @@ unsigned int bcma_core_irq(struct bcma_d
-                       mips_irq = bcma_core_mips_irq(core);
-                       return mips_irq <= 4 ? mips_irq + 2 : 0;
-               }
--              if (bus->host_pdev)
--                      return bcma_of_get_irq(&bus->host_pdev->dev, core, num);
-+              if (bus->dev)
-+                      return bcma_of_get_irq(bus->dev, core, num);
-               return 0;
-       case BCMA_HOSTTYPE_SDIO:
-               return 0;
-@@ -239,18 +239,18 @@ void bcma_prepare_core(struct bcma_bus *
-       core->dev.release = bcma_release_core_dev;
-       core->dev.bus = &bcma_bus_type;
-       dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
--      core->dev.parent = bcma_bus_get_host_dev(bus);
--      if (core->dev.parent)
--              bcma_of_fill_device(core->dev.parent, core);
-+      core->dev.parent = bus->dev;
-+      if (bus->dev)
-+              bcma_of_fill_device(bus->dev, core);
-       switch (bus->hosttype) {
-       case BCMA_HOSTTYPE_PCI:
--              core->dma_dev = &bus->host_pci->dev;
-+              core->dma_dev = bus->dev;
-               core->irq = bus->host_pci->irq;
-               break;
-       case BCMA_HOSTTYPE_SOC:
--              if (IS_ENABLED(CONFIG_OF) && bus->host_pdev) {
--                      core->dma_dev = &bus->host_pdev->dev;
-+              if (IS_ENABLED(CONFIG_OF) && bus->dev) {
-+                      core->dma_dev = bus->dev;
-               } else {
-                       core->dev.dma_mask = &core->dev.coherent_dma_mask;
-                       core->dma_dev = &core->dev;
-@@ -261,28 +261,6 @@ void bcma_prepare_core(struct bcma_bus *
-       }
- }
--struct device *bcma_bus_get_host_dev(struct bcma_bus *bus)
--{
--      switch (bus->hosttype) {
--      case BCMA_HOSTTYPE_PCI:
--              if (bus->host_pci)
--                      return &bus->host_pci->dev;
--              else
--                      return NULL;
--      case BCMA_HOSTTYPE_SOC:
--              if (bus->host_pdev)
--                      return &bus->host_pdev->dev;
--              else
--                      return NULL;
--      case BCMA_HOSTTYPE_SDIO:
--              if (bus->host_sdio)
--                      return &bus->host_sdio->dev;
--              else
--                      return NULL;
--      }
--      return NULL;
--}
--
- void bcma_init_bus(struct bcma_bus *bus)
- {
-       mutex_lock(&bcma_buses_mutex);
-@@ -402,7 +380,6 @@ int bcma_bus_register(struct bcma_bus *b
- {
-       int err;
-       struct bcma_device *core;
--      struct device *dev;
-       /* Scan for devices (cores) */
-       err = bcma_bus_scan(bus);
-@@ -425,10 +402,8 @@ int bcma_bus_register(struct bcma_bus *b
-               bcma_core_pci_early_init(&bus->drv_pci[0]);
-       }
--      dev = bcma_bus_get_host_dev(bus);
--      if (dev) {
--              of_platform_default_populate(dev->of_node, NULL, dev);
--      }
-+      if (bus->dev)
-+              of_platform_default_populate(bus->dev->of_node, NULL, bus->dev);
-       /* Cores providing flash access go before SPROM init */
-       list_for_each_entry(core, &bus->cores, list) {
---- a/include/linux/bcma/bcma.h
-+++ b/include/linux/bcma/bcma.h
-@@ -332,6 +332,8 @@ extern int bcma_arch_register_fallback_s
-               struct ssb_sprom *out));
- struct bcma_bus {
-+      struct device *dev;
-+
-       /* The MMIO area. */
-       void __iomem *mmio;
-@@ -339,14 +341,7 @@ struct bcma_bus {
-       enum bcma_hosttype hosttype;
-       bool host_is_pcie2; /* Used for BCMA_HOSTTYPE_PCI only */
--      union {
--              /* Pointer to the PCI bus (only for BCMA_HOSTTYPE_PCI) */
--              struct pci_dev *host_pci;
--              /* Pointer to the SDIO device (only for BCMA_HOSTTYPE_SDIO) */
--              struct sdio_func *host_sdio;
--              /* Pointer to platform device (only for BCMA_HOSTTYPE_SOC) */
--              struct platform_device *host_pdev;
--      };
-+      struct pci_dev *host_pci; /* PCI bus pointer (BCMA_HOSTTYPE_PCI only) */
-       struct bcma_chipinfo chipinfo;
diff --git a/target/linux/generic/backport-4.14/080-v5.1-0002-bcma-use-dev_-printing-functions.patch b/target/linux/generic/backport-4.14/080-v5.1-0002-bcma-use-dev_-printing-functions.patch
deleted file mode 100644 (file)
index 7ce8ba8..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 777bc4801a6868fcbff09ffb6e30f023e7c5ed38 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Wed, 2 Jan 2019 00:00:02 +0100
-Subject: [PATCH] bcma: use dev_* printing functions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It provides more meaningful messages.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
----
- drivers/bcma/bcma_private.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/drivers/bcma/bcma_private.h
-+++ b/drivers/bcma/bcma_private.h
-@@ -10,13 +10,13 @@
- #include <linux/delay.h>
- #define bcma_err(bus, fmt, ...) \
--      pr_err("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
-+      dev_err((bus)->dev, "bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
- #define bcma_warn(bus, fmt, ...) \
--      pr_warn("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
-+      dev_warn((bus)->dev, "bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
- #define bcma_info(bus, fmt, ...) \
--      pr_info("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
-+      dev_info((bus)->dev, "bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
- #define bcma_debug(bus, fmt, ...) \
--      pr_debug("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
-+      dev_dbg((bus)->dev, "bus%d: " fmt, (bus)->num, ##__VA_ARGS__)
- struct bcma_bus;
diff --git a/target/linux/generic/backport-4.14/085-v4.16-0001-i2c-gpio-Enable-working-over-slow-can_sleep-GPIOs.patch b/target/linux/generic/backport-4.14/085-v4.16-0001-i2c-gpio-Enable-working-over-slow-can_sleep-GPIOs.patch
deleted file mode 100644 (file)
index ead6675..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-From f11a04464ae57e8db1bb7634547842b43e36a898 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jan.kundrat@cesnet.cz>
-Date: Fri, 22 Dec 2017 22:47:16 +0100
-Subject: i2c: gpio: Enable working over slow can_sleep GPIOs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-"Slow" GPIOs (usually those connected over an SPI or an I2C bus) are,
-well, slow in their operation. It is generally a good idea to avoid
-using them for time-critical operation, but sometimes the hardware just
-sucks, and the software has to cope. In addition to that, the I2C bus
-itself does not actually define any strict timing limits; the bus is
-free to go all the way down to DC. The timeouts (and therefore the
-slowest acceptable frequency) are present only in SMBus.
-
-The `can_sleep` is IMHO a wrong concept to use here. My SPI-to-quad-UART
-chip (MAX14830) is connected via a 26MHz SPI bus, and it happily drives
-SCL at 200kHz (5µs pulses) during my benchmarks. That's faster than the
-maximal allowed speed of the traditional I2C.
-
-The previous version of this code did not really block operation over
-slow GPIO pins, anyway. Instead, it just resorted to printing a warning
-with a backtrace each time a GPIO pin was accessed, thereby slowing
-things down even more.
-
-Finally, it's not just me. A similar patch was originally submitted in
-2015 [1].
-
-[1] https://patchwork.ozlabs.org/patch/450956/
-
-Signed-off-by: Jan Kundrát <jan.kundrat@cesnet.cz>
-Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
----
- drivers/i2c/busses/i2c-gpio.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
---- a/drivers/i2c/busses/i2c-gpio.c
-+++ b/drivers/i2c/busses/i2c-gpio.c
-@@ -44,7 +44,7 @@ static void i2c_gpio_setsda_val(void *da
- {
-       struct i2c_gpio_platform_data *pdata = data;
--      gpio_set_value(pdata->sda_pin, state);
-+      gpio_set_value_cansleep(pdata->sda_pin, state);
- }
- /* Toggle SCL by changing the direction of the pin. */
-@@ -68,21 +68,21 @@ static void i2c_gpio_setscl_val(void *da
- {
-       struct i2c_gpio_platform_data *pdata = data;
--      gpio_set_value(pdata->scl_pin, state);
-+      gpio_set_value_cansleep(pdata->scl_pin, state);
- }
- static int i2c_gpio_getsda(void *data)
- {
-       struct i2c_gpio_platform_data *pdata = data;
--      return gpio_get_value(pdata->sda_pin);
-+      return gpio_get_value_cansleep(pdata->sda_pin);
- }
- static int i2c_gpio_getscl(void *data)
- {
-       struct i2c_gpio_platform_data *pdata = data;
--      return gpio_get_value(pdata->scl_pin);
-+      return gpio_get_value_cansleep(pdata->scl_pin);
- }
- static int of_i2c_gpio_get_pins(struct device_node *np,
-@@ -175,6 +175,9 @@ static int i2c_gpio_probe(struct platfor
-               memcpy(pdata, dev_get_platdata(&pdev->dev), sizeof(*pdata));
-       }
-+      if (gpiod_cansleep(gpio_to_desc(pdata->sda_pin)) || gpiod_cansleep(gpio_to_desc(pdata->scl_pin)))
-+              dev_warn(&pdev->dev, "Slow GPIO pins might wreak havoc into I2C/SMBus bus timing");
-+
-       if (pdata->sda_is_open_drain) {
-               gpio_direction_output(pdata->sda_pin, 1);
-               bit_data->setsda = i2c_gpio_setsda_val;
diff --git a/target/linux/generic/backport-4.14/090-net-bridge-add-support-for-port-isolation.patch b/target/linux/generic/backport-4.14/090-net-bridge-add-support-for-port-isolation.patch
deleted file mode 100644 (file)
index 6237177..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
-Date: Thu, 24 May 2018 11:56:48 +0300
-Subject: [PATCH] net: bridge: add support for port isolation
-
-This patch adds support for a new port flag - BR_ISOLATED. If it is set
-then isolated ports cannot communicate between each other, but they can
-still communicate with non-isolated ports. The same can be achieved via
-ACLs but they can't scale with large number of ports and also the
-complexity of the rules grows. This feature can be used to achieve
-isolated vlan functionality (similar to pvlan) as well, though currently
-it will be port-wide (for all vlans on the port). The new test in
-should_deliver uses data that is already cache hot and the new boolean
-is used to avoid an additional source port test in should_deliver.
-
-Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
-Reviewed-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/include/uapi/linux/if_link.h
-+++ b/include/uapi/linux/if_link.h
-@@ -326,6 +326,8 @@ enum {
-       IFLA_BRPORT_MCAST_TO_UCAST,
-       IFLA_BRPORT_VLAN_TUNNEL,
-       IFLA_BRPORT_BCAST_FLOOD,
-+      IFLA_BRPORT_NEIGH_SUPPRESS,
-+      IFLA_BRPORT_ISOLATED,
-       __IFLA_BRPORT_MAX
- };
- #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
---- a/net/bridge/br_forward.c
-+++ b/net/bridge/br_forward.c
-@@ -30,7 +30,8 @@ static inline int should_deliver(const s
-       vg = nbp_vlan_group_rcu(p);
-       return ((p->flags & BR_HAIRPIN_MODE) || skb->dev != p->dev) &&
-               br_allowed_egress(vg, skb) && p->state == BR_STATE_FORWARDING &&
--              nbp_switchdev_allowed_egress(p, skb);
-+              nbp_switchdev_allowed_egress(p, skb) &&
-+              !br_skb_isolated(p, skb);
- }
- int br_dev_queue_push_xmit(struct net *net, struct sock *sk, struct sk_buff *skb)
---- a/net/bridge/br_input.c
-+++ b/net/bridge/br_input.c
-@@ -170,6 +170,7 @@ int br_handle_frame_finish(struct net *n
-               goto drop;
-       BR_INPUT_SKB_CB(skb)->brdev = br->dev;
-+      BR_INPUT_SKB_CB(skb)->src_port_isolated = !!(p->flags & BR_ISOLATED);
-       if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP))
-               br_do_proxy_arp(skb, br, vid, p);
---- a/net/bridge/br_netlink.c
-+++ b/net/bridge/br_netlink.c
-@@ -138,6 +138,7 @@ static inline size_t br_port_info_size(v
-               + nla_total_size(1)     /* IFLA_BRPORT_PROXYARP */
-               + nla_total_size(1)     /* IFLA_BRPORT_PROXYARP_WIFI */
-               + nla_total_size(1)     /* IFLA_BRPORT_VLAN_TUNNEL */
-+              + nla_total_size(1)     /* IFLA_BRPORT_ISOLATED */
-               + nla_total_size(sizeof(struct ifla_bridge_id)) /* IFLA_BRPORT_ROOT_ID */
-               + nla_total_size(sizeof(struct ifla_bridge_id)) /* IFLA_BRPORT_BRIDGE_ID */
-               + nla_total_size(sizeof(u16))   /* IFLA_BRPORT_DESIGNATED_PORT */
-@@ -208,7 +209,8 @@ static int br_port_fill_attrs(struct sk_
-                      p->topology_change_ack) ||
-           nla_put_u8(skb, IFLA_BRPORT_CONFIG_PENDING, p->config_pending) ||
-           nla_put_u8(skb, IFLA_BRPORT_VLAN_TUNNEL, !!(p->flags &
--                                                      BR_VLAN_TUNNEL)))
-+                                                      BR_VLAN_TUNNEL)) ||
-+          nla_put_u8(skb, IFLA_BRPORT_ISOLATED, !!(p->flags & BR_ISOLATED)))
-               return -EMSGSIZE;
-       timerval = br_timer_value(&p->message_age_timer);
-@@ -637,6 +639,7 @@ static const struct nla_policy br_port_p
-       [IFLA_BRPORT_MCAST_TO_UCAST] = { .type = NLA_U8 },
-       [IFLA_BRPORT_MCAST_FLOOD] = { .type = NLA_U8 },
-       [IFLA_BRPORT_BCAST_FLOOD] = { .type = NLA_U8 },
-+      [IFLA_BRPORT_ISOLATED]  = { .type = NLA_U8 },
- };
- /* Change the state of the port and notify spanning tree */
-@@ -773,6 +776,11 @@ static int br_setport(struct net_bridge_
-                       return err;
-       }
- #endif
-+
-+      err = br_set_port_flag(p, tb, IFLA_BRPORT_ISOLATED, BR_ISOLATED);
-+      if (err)
-+              return err;
-+
-       br_port_flags_change(p, old_flags ^ p->flags);
-       return 0;
- }
---- a/net/bridge/br_private.h
-+++ b/net/bridge/br_private.h
-@@ -407,6 +407,7 @@ struct br_input_skb_cb {
- #endif
-       bool proxyarp_replied;
-+      bool src_port_isolated;
- #ifdef CONFIG_BRIDGE_VLAN_FILTERING
-       bool vlan_filtered;
-@@ -554,6 +555,14 @@ int br_forward_finish(struct net *net, s
- void br_flood(struct net_bridge *br, struct sk_buff *skb,
-             enum br_pkt_type pkt_type, bool local_rcv, bool local_orig);
-+/* return true if both source port and dest port are isolated */
-+static inline bool br_skb_isolated(const struct net_bridge_port *to,
-+                                 const struct sk_buff *skb)
-+{
-+      return BR_INPUT_SKB_CB(skb)->src_port_isolated &&
-+             (to->flags & BR_ISOLATED);
-+}
-+
- /* br_if.c */
- void br_port_carrier_check(struct net_bridge_port *p);
- int br_add_bridge(struct net *net, const char *name);
---- a/net/bridge/br_sysfs_if.c
-+++ b/net/bridge/br_sysfs_if.c
-@@ -174,6 +174,7 @@ BRPORT_ATTR_FLAG(proxyarp, BR_PROXYARP);
- BRPORT_ATTR_FLAG(proxyarp_wifi, BR_PROXYARP_WIFI);
- BRPORT_ATTR_FLAG(multicast_flood, BR_MCAST_FLOOD);
- BRPORT_ATTR_FLAG(broadcast_flood, BR_BCAST_FLOOD);
-+BRPORT_ATTR_FLAG(isolated, BR_ISOLATED);
- #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
- static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
-@@ -223,6 +224,7 @@ static const struct brport_attribute *br
-       &brport_attr_proxyarp_wifi,
-       &brport_attr_multicast_flood,
-       &brport_attr_broadcast_flood,
-+      &brport_attr_isolated,
-       NULL
- };
---- a/include/linux/if_bridge.h
-+++ b/include/linux/if_bridge.h
-@@ -49,6 +49,7 @@ struct br_ip_list {
- #define BR_MULTICAST_TO_UNICAST       BIT(12)
- #define BR_VLAN_TUNNEL                BIT(13)
- #define BR_BCAST_FLOOD                BIT(14)
-+#define BR_ISOLATED           BIT(16)
- #define BR_DEFAULT_AGEING_TIME        (300 * HZ)
diff --git a/target/linux/generic/backport-4.14/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch b/target/linux/generic/backport-4.14/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch
deleted file mode 100644 (file)
index e2698dd..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-From 46bf067870156abd61fe24d14c2486d15b8b502c Mon Sep 17 00:00:00 2001
-From: Dave Taht <dave@taht.net>
-Date: Fri, 14 Dec 2018 18:38:40 +0000
-Subject: [PATCH 1/1] Allow class-e address assignment in ifconfig and early
- boot
-
-While the linux kernel became mostly "class-e clean" a decade ago,
-and most distributions long ago switched to the iproute2 suite
-of utilities, which allow class-e (240.0.0.0/4) address assignment,
-distributions relying on busybox, toybox and other forms of
-ifconfig cannot assign class-e addresses without this kernel patch.
-
-With this patch, also, a boot command line on these addresses is feasible:
-(ip=248.0.1.2::248.0.1.1:255.255.255.0).
-
-While CIDR has been obsolete for 2 decades, and a survey of all the
-userspace open source code in the world shows most IN_whatever macros
-are also obsolete... rather than obsolete CIDR from this ioctl entirely,
-this patch merely enables class-e assignment, sanely.
-
-H/T to Vince Fuller and his original patch here:
-    https://lkml.org/lkml/2008/1/7/370
-
-Signed-off-by: Dave Taht <dave.taht@gmail.com>
-Reviewed-by: John Gilmore <gnu@toad.com>
----
- include/uapi/linux/in.h | 8 ++++++--
- net/ipv4/devinet.c      | 4 +++-
- net/ipv4/ipconfig.c     | 2 ++
- 3 files changed, 11 insertions(+), 3 deletions(-)
-
---- a/include/uapi/linux/in.h
-+++ b/include/uapi/linux/in.h
-@@ -268,8 +268,12 @@ struct sockaddr_in {
- #define       IN_MULTICAST(a)         IN_CLASSD(a)
- #define IN_MULTICAST_NET      0xF0000000
--#define       IN_EXPERIMENTAL(a)      ((((long int) (a)) & 0xf0000000) == 0xf0000000)
--#define       IN_BADCLASS(a)          IN_EXPERIMENTAL((a))
-+#define       IN_BADCLASS(a)          (((long int) (a) ) == (long int)0xffffffff)
-+#define       IN_EXPERIMENTAL(a)      IN_BADCLASS((a))
-+
-+#define       IN_CLASSE(a)            ((((long int) (a)) & 0xf0000000) == 0xf0000000)
-+#define       IN_CLASSE_NET           0xffffffff
-+#define       IN_CLASSE_NSHIFT        0
- /* Address to accept any incoming messages. */
- #define       INADDR_ANY              ((unsigned long int) 0x00000000)
---- a/net/ipv4/devinet.c
-+++ b/net/ipv4/devinet.c
-@@ -935,7 +935,7 @@ static int inet_abc_len(__be32 addr)
- {
-       int rc = -1;    /* Something else, probably a multicast. */
--      if (ipv4_is_zeronet(addr))
-+      if (ipv4_is_zeronet(addr) || ipv4_is_lbcast(addr))
-               rc = 0;
-       else {
-               __u32 haddr = ntohl(addr);
-@@ -946,6 +946,8 @@ static int inet_abc_len(__be32 addr)
-                       rc = 16;
-               else if (IN_CLASSC(haddr))
-                       rc = 24;
-+              else if (IN_CLASSE(haddr))
-+                      rc = 32;
-       }
-       return rc;
---- a/net/ipv4/ipconfig.c
-+++ b/net/ipv4/ipconfig.c
-@@ -457,6 +457,8 @@ static int __init ic_defaults(void)
-                       ic_netmask = htonl(IN_CLASSB_NET);
-               else if (IN_CLASSC(ntohl(ic_myaddr)))
-                       ic_netmask = htonl(IN_CLASSC_NET);
-+              else if (IN_CLASSE(ntohl(ic_myaddr)))
-+                      ic_netmask = htonl(IN_CLASSE_NET);
-               else {
-                       pr_err("IP-Config: Unable to guess netmask for address %pI4\n",
-                              &ic_myaddr);
diff --git a/target/linux/generic/backport-4.14/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch b/target/linux/generic/backport-4.14/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch
deleted file mode 100644 (file)
index 2b33843..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 4cc30de79d293f1e8c5f50ae3a9c005def9564a0 Mon Sep 17 00:00:00 2001
-From: Koen Vandeputte <koen.vandeputte@ncentric.com>
-Date: Mon, 7 Jan 2019 14:14:27 +0100
-Subject: [PATCH 2/2] arm: cns3xxx: use actual size reads for PCIe
-
-commit 802b7c06adc7 ("ARM: cns3xxx: Convert PCI to use generic config accessors")
-reimplemented cns3xxx_pci_read_config() using pci_generic_config_read32(),
-which preserved the property of only doing 32-bit reads.
-
-It also replaced cns3xxx_pci_write_config() with pci_generic_config_write(),
-so it changed writes from always being 32 bits to being the actual size,
-which works just fine.
-
-Due to:
-- The documentation does not mention that only 32 bit access is allowed.
-- Writes are already executed using the actual size
-- Extensive testing shows that 8b, 16b and 32b reads work as intended
-
-It makes perfectly sense to also swap 32 bit reading in favor of actual size.
-
-Fixes: 802b7c06adc7 ("ARM: cns3xxx: Convert PCI to use generic config accessors")
-Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
-Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
-CC: Arnd Bergmann <arnd@arndb.de>
-CC: Krzysztof Halasa <khalasa@piap.pl>
-CC: Olof Johansson <olof@lixom.net>
-CC: Robin Leblon <robin.leblon@ncentric.com>
-CC: Rob Herring <robh@kernel.org>
-CC: Russell King <linux@armlinux.org.uk>
-CC: Tim Harvey <tharvey@gateworks.com>
-CC: stable@vger.kernel.org # v4.0+
----
- arch/arm/mach-cns3xxx/pcie.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/arch/arm/mach-cns3xxx/pcie.c
-+++ b/arch/arm/mach-cns3xxx/pcie.c
-@@ -93,7 +93,7 @@ static int cns3xxx_pci_read_config(struc
-       u32 mask = (0x1ull << (size * 8)) - 1;
-       int shift = (where % 4) * 8;
--      ret = pci_generic_config_read32(bus, devfn, where, size, val);
-+      ret = pci_generic_config_read(bus, devfn, where, size, val);
-       if (ret == PCIBIOS_SUCCESSFUL && !bus->number && !devfn &&
-           (where & 0xffc) == PCI_CLASS_REVISION)
diff --git a/target/linux/generic/backport-4.14/183-net-qmi_wwan-add-Wistron-Neweb-D19Q1.patch b/target/linux/generic/backport-4.14/183-net-qmi_wwan-add-Wistron-Neweb-D19Q1.patch
deleted file mode 100644 (file)
index 078c9aa..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From eb5a26bcaddb35fd42a978ad37831e58b1118853 Mon Sep 17 00:00:00 2001
-From: Pawel Dembicki <paweldembicki@gmail.com>
-Date: Tue, 17 Apr 2018 19:53:59 +0200
-Subject: [PATCH] net: qmi_wwan: add Wistron Neweb D19Q1
-
-This modem is embedded on dlink dwr-960 router.
-The oem configuration states:
-
-T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=480 MxCh= 0
-D: Ver= 2.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1
-P: Vendor=1435 ProdID=d191 Rev=ff.ff
-S: Manufacturer=Android
-S: Product=Android
-S: SerialNumber=0123456789ABCDEF
-C:* #Ifs= 6 Cfg#= 1 Atr=80 MxPwr=500mA
-I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
-E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
-E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
-E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms
-E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=(none)
-E: Ad=86(I) Atr=03(Int.) MxPS= 10 Ivl=32ms
-E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
-E: Ad=88(I) Atr=03(Int.) MxPS= 8 Ivl=32ms
-E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-I:* If#= 5 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=(none)
-E: Ad=89(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
-E: Ad=06(O) Atr=02(Bulk) MxPS= 512 Ivl=125us
-
-Tested on openwrt distribution
-
-Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
----
- drivers/net/usb/qmi_wwan.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/usb/qmi_wwan.c
-+++ b/drivers/net/usb/qmi_wwan.c
-@@ -1138,6 +1138,7 @@ static const struct usb_device_id produc
-       {QMI_FIXED_INTF(0x1435, 0xd181, 3)},    /* Wistron NeWeb D18Q1 */
-       {QMI_FIXED_INTF(0x1435, 0xd181, 4)},    /* Wistron NeWeb D18Q1 */
-       {QMI_FIXED_INTF(0x1435, 0xd181, 5)},    /* Wistron NeWeb D18Q1 */
-+      {QMI_FIXED_INTF(0x1435, 0xd191, 4)},    /* Wistron NeWeb D19Q1 */
-       {QMI_QUIRK_SET_DTR(0x1508, 0x1001, 4)}, /* Fibocom NL668 series */
-       {QMI_FIXED_INTF(0x1690, 0x7588, 4)},    /* ASKEY WWHC050 */
-       {QMI_FIXED_INTF(0x16d8, 0x6003, 0)},    /* CMOTech 6003 */
diff --git a/target/linux/generic/backport-4.14/270-batman-adv-Let-packet.h-include-its-headers-directly.patch b/target/linux/generic/backport-4.14/270-batman-adv-Let-packet.h-include-its-headers-directly.patch
deleted file mode 100644 (file)
index 9b3dfc1..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Sven Eckelmann <sven.eckelmann@openmesh.com>
-Date: Thu, 21 Dec 2017 10:17:38 +0100
-Subject: [PATCH] batman-adv: Let packet.h include its headers directly
-
-The headers used by packet.h should also be included by it directly. main.h
-is currently dealing with it in batman-adv, but this will no longer work
-when this header is moved to include/uapi/linux/.
-
-Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/net/batman-adv/main.h
-+++ b/net/batman-adv/main.h
-@@ -184,10 +184,8 @@ enum batadv_uev_type {
- /* Kernel headers */
--#include <linux/bitops.h> /* for packet.h */
- #include <linux/compiler.h>
- #include <linux/etherdevice.h>
--#include <linux/if_ether.h> /* for packet.h */
- #include <linux/if_vlan.h>
- #include <linux/jiffies.h>
- #include <linux/percpu.h>
---- a/net/batman-adv/packet.h
-+++ b/net/batman-adv/packet.h
-@@ -19,6 +19,8 @@
- #define _NET_BATMAN_ADV_PACKET_H_
- #include <asm/byteorder.h>
-+#include <linux/bitops.h>
-+#include <linux/if_ether.h>
- #include <linux/types.h>
- #define batadv_tp_is_error(n) ((u8)(n) > 127 ? 1 : 0)
diff --git a/target/linux/generic/backport-4.14/271-batman-adv-Remove-usage-of-BIT-x-in-packet.h.patch b/target/linux/generic/backport-4.14/271-batman-adv-Remove-usage-of-BIT-x-in-packet.h.patch
deleted file mode 100644 (file)
index 5466d23..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Sven Eckelmann <sven.eckelmann@openmesh.com>
-Date: Thu, 21 Dec 2017 10:17:39 +0100
-Subject: [PATCH] batman-adv: Remove usage of BIT(x) in packet.h
-
-The BIT(x) macro is no longer available for uapi headers because it is
-defined outside of it (linux/bitops.h). The use of it must therefore be
-avoided and replaced by an appropriate other representation.
-
-Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/net/batman-adv/packet.h
-+++ b/net/batman-adv/packet.h
-@@ -19,7 +19,6 @@
- #define _NET_BATMAN_ADV_PACKET_H_
- #include <asm/byteorder.h>
--#include <linux/bitops.h>
- #include <linux/if_ether.h>
- #include <linux/types.h>
-@@ -85,9 +84,9 @@ enum batadv_subtype {
-  *     one hop neighbor on the interface where it was originally received.
-  */
- enum batadv_iv_flags {
--      BATADV_NOT_BEST_NEXT_HOP   = BIT(0),
--      BATADV_PRIMARIES_FIRST_HOP = BIT(1),
--      BATADV_DIRECTLINK          = BIT(2),
-+      BATADV_NOT_BEST_NEXT_HOP   = 1UL << 0,
-+      BATADV_PRIMARIES_FIRST_HOP = 1UL << 1,
-+      BATADV_DIRECTLINK          = 1UL << 2,
- };
- /* ICMP message types */
-@@ -108,9 +107,9 @@ enum batadv_icmp_packettype {
-  * @BATADV_MCAST_WANT_ALL_IPV6: we want all IPv6 multicast packets
-  */
- enum batadv_mcast_flags {
--      BATADV_MCAST_WANT_ALL_UNSNOOPABLES      = BIT(0),
--      BATADV_MCAST_WANT_ALL_IPV4              = BIT(1),
--      BATADV_MCAST_WANT_ALL_IPV6              = BIT(2),
-+      BATADV_MCAST_WANT_ALL_UNSNOOPABLES      = 1UL << 0,
-+      BATADV_MCAST_WANT_ALL_IPV4              = 1UL << 1,
-+      BATADV_MCAST_WANT_ALL_IPV6              = 1UL << 2,
- };
- /* tt data subtypes */
-@@ -124,10 +123,10 @@ enum batadv_mcast_flags {
-  * @BATADV_TT_FULL_TABLE: contains full table to replace existing table
-  */
- enum batadv_tt_data_flags {
--      BATADV_TT_OGM_DIFF   = BIT(0),
--      BATADV_TT_REQUEST    = BIT(1),
--      BATADV_TT_RESPONSE   = BIT(2),
--      BATADV_TT_FULL_TABLE = BIT(4),
-+      BATADV_TT_OGM_DIFF   = 1UL << 0,
-+      BATADV_TT_REQUEST    = 1UL << 1,
-+      BATADV_TT_RESPONSE   = 1UL << 2,
-+      BATADV_TT_FULL_TABLE = 1UL << 4,
- };
- /**
-@@ -135,7 +134,7 @@ enum batadv_tt_data_flags {
-  * @BATADV_VLAN_HAS_TAG: whether the field contains a valid vlan tag or not
-  */
- enum batadv_vlan_flags {
--      BATADV_VLAN_HAS_TAG     = BIT(15),
-+      BATADV_VLAN_HAS_TAG     = 1UL << 15,
- };
- /* claim frame types for the bridge loop avoidance */
diff --git a/target/linux/generic/backport-4.14/272-batman-adv-Remove-kernel-fixed-width-types-in-packet.patch b/target/linux/generic/backport-4.14/272-batman-adv-Remove-kernel-fixed-width-types-in-packet.patch
deleted file mode 100644 (file)
index c46a8f7..0000000
+++ /dev/null
@@ -1,386 +0,0 @@
-From: Sven Eckelmann <sven.eckelmann@openmesh.com>
-Date: Thu, 21 Dec 2017 10:17:40 +0100
-Subject: [PATCH] batman-adv: Remove kernel fixed width types in packet.h
-
-The uapi headers use the __u8/__u16/... version of the fixed width types
-instead of u8/u16/... The use of the latter must be avoided before
-packet.h is copied to include/uapi/linux/.
-
-Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/net/batman-adv/packet.h
-+++ b/net/batman-adv/packet.h
-@@ -22,7 +22,7 @@
- #include <linux/if_ether.h>
- #include <linux/types.h>
--#define batadv_tp_is_error(n) ((u8)(n) > 127 ? 1 : 0)
-+#define batadv_tp_is_error(n) ((__u8)(n) > 127 ? 1 : 0)
- /**
-  * enum batadv_packettype - types for batman-adv encapsulated packets
-@@ -169,8 +169,8 @@ enum batadv_tvlv_type {
-  * transport the claim type and the group id
-  */
- struct batadv_bla_claim_dst {
--      u8     magic[3];        /* FF:43:05 */
--      u8     type;            /* bla_claimframe */
-+      __u8   magic[3];        /* FF:43:05 */
-+      __u8   type;            /* bla_claimframe */
-       __be16 group;           /* group id */
- };
-@@ -190,15 +190,15 @@ struct batadv_bla_claim_dst {
-  * @tvlv_len: length of tvlv data following the ogm header
-  */
- struct batadv_ogm_packet {
--      u8     packet_type;
--      u8     version;
--      u8     ttl;
--      u8     flags;
-+      __u8   packet_type;
-+      __u8   version;
-+      __u8   ttl;
-+      __u8   flags;
-       __be32 seqno;
--      u8     orig[ETH_ALEN];
--      u8     prev_sender[ETH_ALEN];
--      u8     reserved;
--      u8     tq;
-+      __u8   orig[ETH_ALEN];
-+      __u8   prev_sender[ETH_ALEN];
-+      __u8   reserved;
-+      __u8   tq;
-       __be16 tvlv_len;
-       /* __packed is not needed as the struct size is divisible by 4,
-        * and the largest data type in this struct has a size of 4.
-@@ -219,12 +219,12 @@ struct batadv_ogm_packet {
-  * @throughput: the currently flooded path throughput
-  */
- struct batadv_ogm2_packet {
--      u8     packet_type;
--      u8     version;
--      u8     ttl;
--      u8     flags;
-+      __u8   packet_type;
-+      __u8   version;
-+      __u8   ttl;
-+      __u8   flags;
-       __be32 seqno;
--      u8     orig[ETH_ALEN];
-+      __u8   orig[ETH_ALEN];
-       __be16 tvlv_len;
-       __be32 throughput;
-       /* __packed is not needed as the struct size is divisible by 4,
-@@ -243,9 +243,9 @@ struct batadv_ogm2_packet {
-  * @elp_interval: currently used ELP sending interval in ms
-  */
- struct batadv_elp_packet {
--      u8     packet_type;
--      u8     version;
--      u8     orig[ETH_ALEN];
-+      __u8   packet_type;
-+      __u8   version;
-+      __u8   orig[ETH_ALEN];
-       __be32 seqno;
-       __be32 elp_interval;
- };
-@@ -268,14 +268,14 @@ struct batadv_elp_packet {
-  * members are padded the same way as they are in real packets.
-  */
- struct batadv_icmp_header {
--      u8 packet_type;
--      u8 version;
--      u8 ttl;
--      u8 msg_type; /* see ICMP message types above */
--      u8 dst[ETH_ALEN];
--      u8 orig[ETH_ALEN];
--      u8 uid;
--      u8 align[3];
-+      __u8 packet_type;
-+      __u8 version;
-+      __u8 ttl;
-+      __u8 msg_type; /* see ICMP message types above */
-+      __u8 dst[ETH_ALEN];
-+      __u8 orig[ETH_ALEN];
-+      __u8 uid;
-+      __u8 align[3];
- };
- /**
-@@ -291,14 +291,14 @@ struct batadv_icmp_header {
-  * @seqno: ICMP sequence number
-  */
- struct batadv_icmp_packet {
--      u8     packet_type;
--      u8     version;
--      u8     ttl;
--      u8     msg_type; /* see ICMP message types above */
--      u8     dst[ETH_ALEN];
--      u8     orig[ETH_ALEN];
--      u8     uid;
--      u8     reserved;
-+      __u8   packet_type;
-+      __u8   version;
-+      __u8   ttl;
-+      __u8   msg_type; /* see ICMP message types above */
-+      __u8   dst[ETH_ALEN];
-+      __u8   orig[ETH_ALEN];
-+      __u8   uid;
-+      __u8   reserved;
-       __be16 seqno;
- };
-@@ -320,15 +320,15 @@ struct batadv_icmp_packet {
-  *  store it using network order
-  */
- struct batadv_icmp_tp_packet {
--      u8  packet_type;
--      u8  version;
--      u8  ttl;
--      u8  msg_type; /* see ICMP message types above */
--      u8  dst[ETH_ALEN];
--      u8  orig[ETH_ALEN];
--      u8  uid;
--      u8  subtype;
--      u8  session[2];
-+      __u8   packet_type;
-+      __u8   version;
-+      __u8   ttl;
-+      __u8   msg_type; /* see ICMP message types above */
-+      __u8   dst[ETH_ALEN];
-+      __u8   orig[ETH_ALEN];
-+      __u8   uid;
-+      __u8   subtype;
-+      __u8   session[2];
-       __be32 seqno;
-       __be32 timestamp;
- };
-@@ -359,16 +359,16 @@ enum batadv_icmp_tp_subtype {
-  * @rr: route record array
-  */
- struct batadv_icmp_packet_rr {
--      u8     packet_type;
--      u8     version;
--      u8     ttl;
--      u8     msg_type; /* see ICMP message types above */
--      u8     dst[ETH_ALEN];
--      u8     orig[ETH_ALEN];
--      u8     uid;
--      u8     rr_cur;
-+      __u8   packet_type;
-+      __u8   version;
-+      __u8   ttl;
-+      __u8   msg_type; /* see ICMP message types above */
-+      __u8   dst[ETH_ALEN];
-+      __u8   orig[ETH_ALEN];
-+      __u8   uid;
-+      __u8   rr_cur;
-       __be16 seqno;
--      u8     rr[BATADV_RR_LEN][ETH_ALEN];
-+      __u8   rr[BATADV_RR_LEN][ETH_ALEN];
- };
- #define BATADV_ICMP_MAX_PACKET_SIZE   sizeof(struct batadv_icmp_packet_rr)
-@@ -394,11 +394,11 @@ struct batadv_icmp_packet_rr {
-  * @dest: originator destination of the unicast packet
-  */
- struct batadv_unicast_packet {
--      u8 packet_type;
--      u8 version;
--      u8 ttl;
--      u8 ttvn; /* destination translation table version number */
--      u8 dest[ETH_ALEN];
-+      __u8 packet_type;
-+      __u8 version;
-+      __u8 ttl;
-+      __u8 ttvn; /* destination translation table version number */
-+      __u8 dest[ETH_ALEN];
-       /* "4 bytes boundary + 2 bytes" long to make the payload after the
-        * following ethernet header again 4 bytes boundary aligned
-        */
-@@ -413,9 +413,9 @@ struct batadv_unicast_packet {
-  */
- struct batadv_unicast_4addr_packet {
-       struct batadv_unicast_packet u;
--      u8 src[ETH_ALEN];
--      u8 subtype;
--      u8 reserved;
-+      __u8 src[ETH_ALEN];
-+      __u8 subtype;
-+      __u8 reserved;
-       /* "4 bytes boundary + 2 bytes" long to make the payload after the
-        * following ethernet header again 4 bytes boundary aligned
-        */
-@@ -435,22 +435,22 @@ struct batadv_unicast_4addr_packet {
-  * @total_size: size of the merged packet
-  */
- struct batadv_frag_packet {
--      u8     packet_type;
--      u8     version;  /* batman version field */
--      u8     ttl;
-+      __u8   packet_type;
-+      __u8   version;  /* batman version field */
-+      __u8   ttl;
- #if defined(__BIG_ENDIAN_BITFIELD)
--      u8     no:4;
--      u8     priority:3;
--      u8     reserved:1;
-+      __u8   no:4;
-+      __u8   priority:3;
-+      __u8   reserved:1;
- #elif defined(__LITTLE_ENDIAN_BITFIELD)
--      u8     reserved:1;
--      u8     priority:3;
--      u8     no:4;
-+      __u8   reserved:1;
-+      __u8   priority:3;
-+      __u8   no:4;
- #else
- #error "unknown bitfield endianness"
- #endif
--      u8     dest[ETH_ALEN];
--      u8     orig[ETH_ALEN];
-+      __u8   dest[ETH_ALEN];
-+      __u8   orig[ETH_ALEN];
-       __be16 seqno;
-       __be16 total_size;
- };
-@@ -465,12 +465,12 @@ struct batadv_frag_packet {
-  * @orig: originator of the broadcast packet
-  */
- struct batadv_bcast_packet {
--      u8     packet_type;
--      u8     version;  /* batman version field */
--      u8     ttl;
--      u8     reserved;
-+      __u8   packet_type;
-+      __u8   version;  /* batman version field */
-+      __u8   ttl;
-+      __u8   reserved;
-       __be32 seqno;
--      u8     orig[ETH_ALEN];
-+      __u8   orig[ETH_ALEN];
-       /* "4 bytes boundary + 2 bytes" long to make the payload after the
-        * following ethernet header again 4 bytes boundary aligned
-        */
-@@ -494,19 +494,19 @@ struct batadv_bcast_packet {
-  * @coded_len: length of network coded part of the payload
-  */
- struct batadv_coded_packet {
--      u8     packet_type;
--      u8     version;  /* batman version field */
--      u8     ttl;
--      u8     first_ttvn;
--      /* u8  first_dest[ETH_ALEN]; - saved in mac header destination */
--      u8     first_source[ETH_ALEN];
--      u8     first_orig_dest[ETH_ALEN];
-+      __u8   packet_type;
-+      __u8   version;  /* batman version field */
-+      __u8   ttl;
-+      __u8   first_ttvn;
-+      /* __u8 first_dest[ETH_ALEN]; - saved in mac header destination */
-+      __u8   first_source[ETH_ALEN];
-+      __u8   first_orig_dest[ETH_ALEN];
-       __be32 first_crc;
--      u8     second_ttl;
--      u8     second_ttvn;
--      u8     second_dest[ETH_ALEN];
--      u8     second_source[ETH_ALEN];
--      u8     second_orig_dest[ETH_ALEN];
-+      __u8   second_ttl;
-+      __u8   second_ttvn;
-+      __u8   second_dest[ETH_ALEN];
-+      __u8   second_source[ETH_ALEN];
-+      __u8   second_orig_dest[ETH_ALEN];
-       __be32 second_crc;
-       __be16 coded_len;
- };
-@@ -525,14 +525,14 @@ struct batadv_coded_packet {
-  * @align: 2 bytes to align the header to a 4 byte boundary
-  */
- struct batadv_unicast_tvlv_packet {
--      u8     packet_type;
--      u8     version;  /* batman version field */
--      u8     ttl;
--      u8     reserved;
--      u8     dst[ETH_ALEN];
--      u8     src[ETH_ALEN];
-+      __u8   packet_type;
-+      __u8   version;  /* batman version field */
-+      __u8   ttl;
-+      __u8   reserved;
-+      __u8   dst[ETH_ALEN];
-+      __u8   src[ETH_ALEN];
-       __be16 tvlv_len;
--      u16    align;
-+      __u16  align;
- };
- /**
-@@ -542,8 +542,8 @@ struct batadv_unicast_tvlv_packet {
-  * @len: tvlv container length
-  */
- struct batadv_tvlv_hdr {
--      u8     type;
--      u8     version;
-+      __u8   type;
-+      __u8   version;
-       __be16 len;
- };
-@@ -566,8 +566,8 @@ struct batadv_tvlv_gateway_data {
-  *  one batadv_tvlv_tt_vlan_data object per announced vlan
-  */
- struct batadv_tvlv_tt_data {
--      u8     flags;
--      u8     ttvn;
-+      __u8   flags;
-+      __u8   ttvn;
-       __be16 num_vlan;
- };
-@@ -581,7 +581,7 @@ struct batadv_tvlv_tt_data {
- struct batadv_tvlv_tt_vlan_data {
-       __be32 crc;
-       __be16 vid;
--      u16    reserved;
-+      __u16  reserved;
- };
- /**
-@@ -593,9 +593,9 @@ struct batadv_tvlv_tt_vlan_data {
-  * @vid: VLAN identifier
-  */
- struct batadv_tvlv_tt_change {
--      u8     flags;
--      u8     reserved[3];
--      u8     addr[ETH_ALEN];
-+      __u8   flags;
-+      __u8   reserved[3];
-+      __u8   addr[ETH_ALEN];
-       __be16 vid;
- };
-@@ -605,7 +605,7 @@ struct batadv_tvlv_tt_change {
-  * @vid: VLAN identifier
-  */
- struct batadv_tvlv_roam_adv {
--      u8     client[ETH_ALEN];
-+      __u8   client[ETH_ALEN];
-       __be16 vid;
- };
-@@ -615,8 +615,8 @@ struct batadv_tvlv_roam_adv {
-  * @reserved: reserved field
-  */
- struct batadv_tvlv_mcast_data {
--      u8 flags;
--      u8 reserved[3];
-+      __u8 flags;
-+      __u8 reserved[3];
- };
- #endif /* _NET_BATMAN_ADV_PACKET_H_ */
diff --git a/target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch b/target/linux/generic/backport-4.14/273-batman-adv-Convert-packet.h-to-uapi-header.patch
deleted file mode 100644 (file)
index a9f744f..0000000
+++ /dev/null
@@ -1,1665 +0,0 @@
-From: Sven Eckelmann <sven.eckelmann@openmesh.com>
-Date: Thu, 21 Dec 2017 10:17:41 +0100
-Subject: [PATCH] batman-adv: Convert packet.h to uapi header
-
-The header file is used by different userspace programs to inject packets
-or to decode sniffed packets. It should therefore be available to them as
-userspace header.
-
-Also other components in the kernel (like the flow dissector) require
-access to the packet definitions to be able to decode ETH_P_BATMAN ethernet
-packets.
-
-Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- rename net/batman-adv/packet.h => include/uapi/linux/batadv_packet.h (99%)
-
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -2551,6 +2551,7 @@ S:       Maintained
- F:    Documentation/ABI/testing/sysfs-class-net-batman-adv
- F:    Documentation/ABI/testing/sysfs-class-net-mesh
- F:    Documentation/networking/batman-adv.rst
-+F:    include/uapi/linux/batadv_packet.h
- F:    include/uapi/linux/batman_adv.h
- F:    net/batman-adv/
---- a/net/batman-adv/bat_iv_ogm.c
-+++ b/net/batman-adv/bat_iv_ogm.c
-@@ -52,6 +52,7 @@
- #include <linux/workqueue.h>
- #include <net/genetlink.h>
- #include <net/netlink.h>
-+#include <uapi/linux/batadv_packet.h>
- #include <uapi/linux/batman_adv.h>
- #include "bat_algo.h"
-@@ -63,7 +64,6 @@
- #include "netlink.h"
- #include "network-coding.h"
- #include "originator.h"
--#include "packet.h"
- #include "routing.h"
- #include "send.h"
- #include "translation-table.h"
---- a/net/batman-adv/bat_v.c
-+++ b/net/batman-adv/bat_v.c
-@@ -36,6 +36,7 @@
- #include <linux/workqueue.h>
- #include <net/genetlink.h>
- #include <net/netlink.h>
-+#include <uapi/linux/batadv_packet.h>
- #include <uapi/linux/batman_adv.h>
- #include "bat_algo.h"
-@@ -48,7 +49,6 @@
- #include "log.h"
- #include "netlink.h"
- #include "originator.h"
--#include "packet.h"
- struct sk_buff;
---- a/net/batman-adv/bat_v_elp.c
-+++ b/net/batman-adv/bat_v_elp.c
-@@ -41,13 +41,13 @@
- #include <linux/types.h>
- #include <linux/workqueue.h>
- #include <net/cfg80211.h>
-+#include <uapi/linux/batadv_packet.h>
- #include "bat_algo.h"
- #include "bat_v_ogm.h"
- #include "hard-interface.h"
- #include "log.h"
- #include "originator.h"
--#include "packet.h"
- #include "routing.h"
- #include "send.h"
---- a/net/batman-adv/bat_v_ogm.c
-+++ b/net/batman-adv/bat_v_ogm.c
-@@ -40,13 +40,13 @@
- #include <linux/string.h>
- #include <linux/types.h>
- #include <linux/workqueue.h>
-+#include <uapi/linux/batadv_packet.h>
- #include "bat_algo.h"
- #include "hard-interface.h"
- #include "hash.h"
- #include "log.h"
- #include "originator.h"
--#include "packet.h"
- #include "routing.h"
- #include "send.h"
- #include "translation-table.h"
---- a/net/batman-adv/bridge_loop_avoidance.c
-+++ b/net/batman-adv/bridge_loop_avoidance.c
-@@ -49,6 +49,7 @@
- #include <net/genetlink.h>
- #include <net/netlink.h>
- #include <net/sock.h>
-+#include <uapi/linux/batadv_packet.h>
- #include <uapi/linux/batman_adv.h>
- #include "hard-interface.h"
-@@ -56,7 +57,6 @@
- #include "log.h"
- #include "netlink.h"
- #include "originator.h"
--#include "packet.h"
- #include "soft-interface.h"
- #include "sysfs.h"
- #include "translation-table.h"
---- a/net/batman-adv/distributed-arp-table.h
-+++ b/net/batman-adv/distributed-arp-table.h
-@@ -23,9 +23,9 @@
- #include <linux/compiler.h>
- #include <linux/netdevice.h>
- #include <linux/types.h>
-+#include <uapi/linux/batadv_packet.h>
- #include "originator.h"
--#include "packet.h"
- struct seq_file;
- struct sk_buff;
---- a/net/batman-adv/fragmentation.c
-+++ b/net/batman-adv/fragmentation.c
-@@ -32,10 +32,10 @@
- #include <linux/slab.h>
- #include <linux/spinlock.h>
- #include <linux/string.h>
-+#include <uapi/linux/batadv_packet.h>
- #include "hard-interface.h"
- #include "originator.h"
--#include "packet.h"
- #include "routing.h"
- #include "send.h"
- #include "soft-interface.h"
---- a/net/batman-adv/gateway_client.c
-+++ b/net/batman-adv/gateway_client.c
-@@ -43,6 +43,7 @@
- #include <linux/stddef.h>
- #include <linux/udp.h>
- #include <net/sock.h>
-+#include <uapi/linux/batadv_packet.h>
- #include <uapi/linux/batman_adv.h>
- #include "gateway_common.h"
-@@ -50,7 +51,6 @@
- #include "log.h"
- #include "netlink.h"
- #include "originator.h"
--#include "packet.h"
- #include "routing.h"
- #include "soft-interface.h"
- #include "sysfs.h"
---- a/net/batman-adv/gateway_common.c
-+++ b/net/batman-adv/gateway_common.c
-@@ -26,10 +26,10 @@
- #include <linux/netdevice.h>
- #include <linux/stddef.h>
- #include <linux/string.h>
-+#include <uapi/linux/batadv_packet.h>
- #include "gateway_client.h"
- #include "log.h"
--#include "packet.h"
- #include "tvlv.h"
- /**
---- a/net/batman-adv/hard-interface.c
-+++ b/net/batman-adv/hard-interface.c
-@@ -37,6 +37,7 @@
- #include <linux/spinlock.h>
- #include <net/net_namespace.h>
- #include <net/rtnetlink.h>
-+#include <uapi/linux/batadv_packet.h>
- #include "bat_v.h"
- #include "bridge_loop_avoidance.h"
-@@ -45,7 +46,6 @@
- #include "gateway_client.h"
- #include "log.h"
- #include "originator.h"
--#include "packet.h"
- #include "send.h"
- #include "soft-interface.h"
- #include "sysfs.h"
---- a/net/batman-adv/icmp_socket.c
-+++ b/net/batman-adv/icmp_socket.c
-@@ -42,11 +42,11 @@
- #include <linux/string.h>
- #include <linux/uaccess.h>
- #include <linux/wait.h>
-+#include <uapi/linux/batadv_packet.h>
- #include "hard-interface.h"
- #include "log.h"
- #include "originator.h"
--#include "packet.h"
- #include "send.h"
- static struct batadv_socket_client *batadv_socket_client_hash[256];
---- a/net/batman-adv/main.c
-+++ b/net/batman-adv/main.c
-@@ -45,6 +45,7 @@
- #include <linux/workqueue.h>
- #include <net/dsfield.h>
- #include <net/rtnetlink.h>
-+#include <uapi/linux/batadv_packet.h>
- #include <uapi/linux/batman_adv.h>
- #include "bat_algo.h"
-@@ -62,7 +63,6 @@
- #include "netlink.h"
- #include "network-coding.h"
- #include "originator.h"
--#include "packet.h"
- #include "routing.h"
- #include "send.h"
- #include "soft-interface.h"
---- a/net/batman-adv/main.h
-+++ b/net/batman-adv/main.h
-@@ -190,8 +190,8 @@ enum batadv_uev_type {
- #include <linux/jiffies.h>
- #include <linux/percpu.h>
- #include <linux/types.h>
-+#include <uapi/linux/batadv_packet.h>
--#include "packet.h"
- #include "types.h"
- struct net_device;
---- a/net/batman-adv/multicast.c
-+++ b/net/batman-adv/multicast.c
-@@ -54,11 +54,11 @@
- #include <net/if_inet6.h>
- #include <net/ip.h>
- #include <net/ipv6.h>
-+#include <uapi/linux/batadv_packet.h>
- #include "hard-interface.h"
- #include "hash.h"
- #include "log.h"
--#include "packet.h"
- #include "translation-table.h"
- #include "tvlv.h"
---- a/net/batman-adv/netlink.c
-+++ b/net/batman-adv/netlink.c
-@@ -39,6 +39,7 @@
- #include <net/genetlink.h>
- #include <net/netlink.h>
- #include <net/sock.h>
-+#include <uapi/linux/batadv_packet.h>
- #include <uapi/linux/batman_adv.h>
- #include "bat_algo.h"
-@@ -46,7 +47,6 @@
- #include "gateway_client.h"
- #include "hard-interface.h"
- #include "originator.h"
--#include "packet.h"
- #include "soft-interface.h"
- #include "tp_meter.h"
- #include "translation-table.h"
---- a/net/batman-adv/network-coding.c
-+++ b/net/batman-adv/network-coding.c
-@@ -47,12 +47,12 @@
- #include <linux/stddef.h>
- #include <linux/string.h>
- #include <linux/workqueue.h>
-+#include <uapi/linux/batadv_packet.h>
- #include "hard-interface.h"
- #include "hash.h"
- #include "log.h"
- #include "originator.h"
--#include "packet.h"
- #include "routing.h"
- #include "send.h"
- #include "tvlv.h"
---- a/net/batman-adv/packet.h
-+++ /dev/null
-@@ -1,622 +0,0 @@
--/* Copyright (C) 2007-2017  B.A.T.M.A.N. contributors:
-- *
-- * Marek Lindner, Simon Wunderlich
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of version 2 of the GNU General Public
-- * License as published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef _NET_BATMAN_ADV_PACKET_H_
--#define _NET_BATMAN_ADV_PACKET_H_
--
--#include <asm/byteorder.h>
--#include <linux/if_ether.h>
--#include <linux/types.h>
--
--#define batadv_tp_is_error(n) ((__u8)(n) > 127 ? 1 : 0)
--
--/**
-- * enum batadv_packettype - types for batman-adv encapsulated packets
-- * @BATADV_IV_OGM: originator messages for B.A.T.M.A.N. IV
-- * @BATADV_BCAST: broadcast packets carrying broadcast payload
-- * @BATADV_CODED: network coded packets
-- * @BATADV_ELP: echo location packets for B.A.T.M.A.N. V
-- * @BATADV_OGM2: originator messages for B.A.T.M.A.N. V
-- *
-- * @BATADV_UNICAST: unicast packets carrying unicast payload traffic
-- * @BATADV_UNICAST_FRAG: unicast packets carrying a fragment of the original
-- *     payload packet
-- * @BATADV_UNICAST_4ADDR: unicast packet including the originator address of
-- *     the sender
-- * @BATADV_ICMP: unicast packet like IP ICMP used for ping or traceroute
-- * @BATADV_UNICAST_TVLV: unicast packet carrying TVLV containers
-- */
--enum batadv_packettype {
--      /* 0x00 - 0x3f: local packets or special rules for handling */
--      BATADV_IV_OGM           = 0x00,
--      BATADV_BCAST            = 0x01,
--      BATADV_CODED            = 0x02,
--      BATADV_ELP              = 0x03,
--      BATADV_OGM2             = 0x04,
--      /* 0x40 - 0x7f: unicast */
--#define BATADV_UNICAST_MIN     0x40
--      BATADV_UNICAST          = 0x40,
--      BATADV_UNICAST_FRAG     = 0x41,
--      BATADV_UNICAST_4ADDR    = 0x42,
--      BATADV_ICMP             = 0x43,
--      BATADV_UNICAST_TVLV     = 0x44,
--#define BATADV_UNICAST_MAX     0x7f
--      /* 0x80 - 0xff: reserved */
--};
--
--/**
-- * enum batadv_subtype - packet subtype for unicast4addr
-- * @BATADV_P_DATA: user payload
-- * @BATADV_P_DAT_DHT_GET: DHT request message
-- * @BATADV_P_DAT_DHT_PUT: DHT store message
-- * @BATADV_P_DAT_CACHE_REPLY: ARP reply generated by DAT
-- */
--enum batadv_subtype {
--      BATADV_P_DATA                   = 0x01,
--      BATADV_P_DAT_DHT_GET            = 0x02,
--      BATADV_P_DAT_DHT_PUT            = 0x03,
--      BATADV_P_DAT_CACHE_REPLY        = 0x04,
--};
--
--/* this file is included by batctl which needs these defines */
--#define BATADV_COMPAT_VERSION 15
--
--/**
-- * enum batadv_iv_flags - flags used in B.A.T.M.A.N. IV OGM packets
-- * @BATADV_NOT_BEST_NEXT_HOP: flag is set when ogm packet is forwarded and was
-- *     previously received from someone else than the best neighbor.
-- * @BATADV_PRIMARIES_FIRST_HOP: flag unused.
-- * @BATADV_DIRECTLINK: flag is for the first hop or if rebroadcasted from a
-- *     one hop neighbor on the interface where it was originally received.
-- */
--enum batadv_iv_flags {
--      BATADV_NOT_BEST_NEXT_HOP   = 1UL << 0,
--      BATADV_PRIMARIES_FIRST_HOP = 1UL << 1,
--      BATADV_DIRECTLINK          = 1UL << 2,
--};
--
--/* ICMP message types */
--enum batadv_icmp_packettype {
--      BATADV_ECHO_REPLY              = 0,
--      BATADV_DESTINATION_UNREACHABLE = 3,
--      BATADV_ECHO_REQUEST            = 8,
--      BATADV_TTL_EXCEEDED            = 11,
--      BATADV_PARAMETER_PROBLEM       = 12,
--      BATADV_TP                      = 15,
--};
--
--/**
-- * enum batadv_mcast_flags - flags for multicast capabilities and settings
-- * @BATADV_MCAST_WANT_ALL_UNSNOOPABLES: we want all packets destined for
-- *  224.0.0.0/24 or ff02::1
-- * @BATADV_MCAST_WANT_ALL_IPV4: we want all IPv4 multicast packets
-- * @BATADV_MCAST_WANT_ALL_IPV6: we want all IPv6 multicast packets
-- */
--enum batadv_mcast_flags {
--      BATADV_MCAST_WANT_ALL_UNSNOOPABLES      = 1UL << 0,
--      BATADV_MCAST_WANT_ALL_IPV4              = 1UL << 1,
--      BATADV_MCAST_WANT_ALL_IPV6              = 1UL << 2,
--};
--
--/* tt data subtypes */
--#define BATADV_TT_DATA_TYPE_MASK 0x0F
--
--/**
-- * enum batadv_tt_data_flags - flags for tt data tvlv
-- * @BATADV_TT_OGM_DIFF: TT diff propagated through OGM
-- * @BATADV_TT_REQUEST: TT request message
-- * @BATADV_TT_RESPONSE: TT response message
-- * @BATADV_TT_FULL_TABLE: contains full table to replace existing table
-- */
--enum batadv_tt_data_flags {
--      BATADV_TT_OGM_DIFF   = 1UL << 0,
--      BATADV_TT_REQUEST    = 1UL << 1,
--      BATADV_TT_RESPONSE   = 1UL << 2,
--      BATADV_TT_FULL_TABLE = 1UL << 4,
--};
--
--/**
-- * enum batadv_vlan_flags - flags for the four MSB of any vlan ID field
-- * @BATADV_VLAN_HAS_TAG: whether the field contains a valid vlan tag or not
-- */
--enum batadv_vlan_flags {
--      BATADV_VLAN_HAS_TAG     = 1UL << 15,
--};
--
--/* claim frame types for the bridge loop avoidance */
--enum batadv_bla_claimframe {
--      BATADV_CLAIM_TYPE_CLAIM         = 0x00,
--      BATADV_CLAIM_TYPE_UNCLAIM       = 0x01,
--      BATADV_CLAIM_TYPE_ANNOUNCE      = 0x02,
--      BATADV_CLAIM_TYPE_REQUEST       = 0x03,
--      BATADV_CLAIM_TYPE_LOOPDETECT    = 0x04,
--};
--
--/**
-- * enum batadv_tvlv_type - tvlv type definitions
-- * @BATADV_TVLV_GW: gateway tvlv
-- * @BATADV_TVLV_DAT: distributed arp table tvlv
-- * @BATADV_TVLV_NC: network coding tvlv
-- * @BATADV_TVLV_TT: translation table tvlv
-- * @BATADV_TVLV_ROAM: roaming advertisement tvlv
-- * @BATADV_TVLV_MCAST: multicast capability tvlv
-- */
--enum batadv_tvlv_type {
--      BATADV_TVLV_GW          = 0x01,
--      BATADV_TVLV_DAT         = 0x02,
--      BATADV_TVLV_NC          = 0x03,
--      BATADV_TVLV_TT          = 0x04,
--      BATADV_TVLV_ROAM        = 0x05,
--      BATADV_TVLV_MCAST       = 0x06,
--};
--
--#pragma pack(2)
--/* the destination hardware field in the ARP frame is used to
-- * transport the claim type and the group id
-- */
--struct batadv_bla_claim_dst {
--      __u8   magic[3];        /* FF:43:05 */
--      __u8   type;            /* bla_claimframe */
--      __be16 group;           /* group id */
--};
--
--#pragma pack()
--
--/**
-- * struct batadv_ogm_packet - ogm (routing protocol) packet
-- * @packet_type: batman-adv packet type, part of the general header
-- * @version: batman-adv protocol version, part of the genereal header
-- * @ttl: time to live for this packet, part of the genereal header
-- * @flags: contains routing relevant flags - see enum batadv_iv_flags
-- * @seqno: sequence identification
-- * @orig: address of the source node
-- * @prev_sender: address of the previous sender
-- * @reserved: reserved byte for alignment
-- * @tq: transmission quality
-- * @tvlv_len: length of tvlv data following the ogm header
-- */
--struct batadv_ogm_packet {
--      __u8   packet_type;
--      __u8   version;
--      __u8   ttl;
--      __u8   flags;
--      __be32 seqno;
--      __u8   orig[ETH_ALEN];
--      __u8   prev_sender[ETH_ALEN];
--      __u8   reserved;
--      __u8   tq;
--      __be16 tvlv_len;
--      /* __packed is not needed as the struct size is divisible by 4,
--       * and the largest data type in this struct has a size of 4.
--       */
--};
--
--#define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet)
--
--/**
-- * struct batadv_ogm2_packet - ogm2 (routing protocol) packet
-- * @packet_type: batman-adv packet type, part of the general header
-- * @version: batman-adv protocol version, part of the general header
-- * @ttl: time to live for this packet, part of the general header
-- * @flags: reseved for routing relevant flags - currently always 0
-- * @seqno: sequence number
-- * @orig: originator mac address
-- * @tvlv_len: length of the appended tvlv buffer (in bytes)
-- * @throughput: the currently flooded path throughput
-- */
--struct batadv_ogm2_packet {
--      __u8   packet_type;
--      __u8   version;
--      __u8   ttl;
--      __u8   flags;
--      __be32 seqno;
--      __u8   orig[ETH_ALEN];
--      __be16 tvlv_len;
--      __be32 throughput;
--      /* __packed is not needed as the struct size is divisible by 4,
--       * and the largest data type in this struct has a size of 4.
--       */
--};
--
--#define BATADV_OGM2_HLEN sizeof(struct batadv_ogm2_packet)
--
--/**
-- * struct batadv_elp_packet - elp (neighbor discovery) packet
-- * @packet_type: batman-adv packet type, part of the general header
-- * @version: batman-adv protocol version, part of the genereal header
-- * @orig: originator mac address
-- * @seqno: sequence number
-- * @elp_interval: currently used ELP sending interval in ms
-- */
--struct batadv_elp_packet {
--      __u8   packet_type;
--      __u8   version;
--      __u8   orig[ETH_ALEN];
--      __be32 seqno;
--      __be32 elp_interval;
--};
--
--#define BATADV_ELP_HLEN sizeof(struct batadv_elp_packet)
--
--/**
-- * struct batadv_icmp_header - common members among all the ICMP packets
-- * @packet_type: batman-adv packet type, part of the general header
-- * @version: batman-adv protocol version, part of the genereal header
-- * @ttl: time to live for this packet, part of the genereal header
-- * @msg_type: ICMP packet type
-- * @dst: address of the destination node
-- * @orig: address of the source node
-- * @uid: local ICMP socket identifier
-- * @align: not used - useful for alignment purposes only
-- *
-- * This structure is used for ICMP packets parsing only and it is never sent
-- * over the wire. The alignment field at the end is there to ensure that
-- * members are padded the same way as they are in real packets.
-- */
--struct batadv_icmp_header {
--      __u8 packet_type;
--      __u8 version;
--      __u8 ttl;
--      __u8 msg_type; /* see ICMP message types above */
--      __u8 dst[ETH_ALEN];
--      __u8 orig[ETH_ALEN];
--      __u8 uid;
--      __u8 align[3];
--};
--
--/**
-- * struct batadv_icmp_packet - ICMP packet
-- * @packet_type: batman-adv packet type, part of the general header
-- * @version: batman-adv protocol version, part of the genereal header
-- * @ttl: time to live for this packet, part of the genereal header
-- * @msg_type: ICMP packet type
-- * @dst: address of the destination node
-- * @orig: address of the source node
-- * @uid: local ICMP socket identifier
-- * @reserved: not used - useful for alignment
-- * @seqno: ICMP sequence number
-- */
--struct batadv_icmp_packet {
--      __u8   packet_type;
--      __u8   version;
--      __u8   ttl;
--      __u8   msg_type; /* see ICMP message types above */
--      __u8   dst[ETH_ALEN];
--      __u8   orig[ETH_ALEN];
--      __u8   uid;
--      __u8   reserved;
--      __be16 seqno;
--};
--
--/**
-- * struct batadv_icmp_tp_packet - ICMP TP Meter packet
-- * @packet_type: batman-adv packet type, part of the general header
-- * @version: batman-adv protocol version, part of the genereal header
-- * @ttl: time to live for this packet, part of the genereal header
-- * @msg_type: ICMP packet type
-- * @dst: address of the destination node
-- * @orig: address of the source node
-- * @uid: local ICMP socket identifier
-- * @subtype: TP packet subtype (see batadv_icmp_tp_subtype)
-- * @session: TP session identifier
-- * @seqno: the TP sequence number
-- * @timestamp: time when the packet has been sent. This value is filled in a
-- *  TP_MSG and echoed back in the next TP_ACK so that the sender can compute the
-- *  RTT. Since it is read only by the host which wrote it, there is no need to
-- *  store it using network order
-- */
--struct batadv_icmp_tp_packet {
--      __u8   packet_type;
--      __u8   version;
--      __u8   ttl;
--      __u8   msg_type; /* see ICMP message types above */
--      __u8   dst[ETH_ALEN];
--      __u8   orig[ETH_ALEN];
--      __u8   uid;
--      __u8   subtype;
--      __u8   session[2];
--      __be32 seqno;
--      __be32 timestamp;
--};
--
--/**
-- * enum batadv_icmp_tp_subtype - ICMP TP Meter packet subtypes
-- * @BATADV_TP_MSG: Msg from sender to receiver
-- * @BATADV_TP_ACK: acknowledgment from receiver to sender
-- */
--enum batadv_icmp_tp_subtype {
--      BATADV_TP_MSG   = 0,
--      BATADV_TP_ACK,
--};
--
--#define BATADV_RR_LEN 16
--
--/**
-- * struct batadv_icmp_packet_rr - ICMP RouteRecord packet
-- * @packet_type: batman-adv packet type, part of the general header
-- * @version: batman-adv protocol version, part of the genereal header
-- * @ttl: time to live for this packet, part of the genereal header
-- * @msg_type: ICMP packet type
-- * @dst: address of the destination node
-- * @orig: address of the source node
-- * @uid: local ICMP socket identifier
-- * @rr_cur: number of entries the rr array
-- * @seqno: ICMP sequence number
-- * @rr: route record array
-- */
--struct batadv_icmp_packet_rr {
--      __u8   packet_type;
--      __u8   version;
--      __u8   ttl;
--      __u8   msg_type; /* see ICMP message types above */
--      __u8   dst[ETH_ALEN];
--      __u8   orig[ETH_ALEN];
--      __u8   uid;
--      __u8   rr_cur;
--      __be16 seqno;
--      __u8   rr[BATADV_RR_LEN][ETH_ALEN];
--};
--
--#define BATADV_ICMP_MAX_PACKET_SIZE   sizeof(struct batadv_icmp_packet_rr)
--
--/* All packet headers in front of an ethernet header have to be completely
-- * divisible by 2 but not by 4 to make the payload after the ethernet
-- * header again 4 bytes boundary aligned.
-- *
-- * A packing of 2 is necessary to avoid extra padding at the end of the struct
-- * caused by a structure member which is larger than two bytes. Otherwise
-- * the structure would not fulfill the previously mentioned rule to avoid the
-- * misalignment of the payload after the ethernet header. It may also lead to
-- * leakage of information when the padding it not initialized before sending.
-- */
--#pragma pack(2)
--
--/**
-- * struct batadv_unicast_packet - unicast packet for network payload
-- * @packet_type: batman-adv packet type, part of the general header
-- * @version: batman-adv protocol version, part of the genereal header
-- * @ttl: time to live for this packet, part of the genereal header
-- * @ttvn: translation table version number
-- * @dest: originator destination of the unicast packet
-- */
--struct batadv_unicast_packet {
--      __u8 packet_type;
--      __u8 version;
--      __u8 ttl;
--      __u8 ttvn; /* destination translation table version number */
--      __u8 dest[ETH_ALEN];
--      /* "4 bytes boundary + 2 bytes" long to make the payload after the
--       * following ethernet header again 4 bytes boundary aligned
--       */
--};
--
--/**
-- * struct batadv_unicast_4addr_packet - extended unicast packet
-- * @u: common unicast packet header
-- * @src: address of the source
-- * @subtype: packet subtype
-- * @reserved: reserved byte for alignment
-- */
--struct batadv_unicast_4addr_packet {
--      struct batadv_unicast_packet u;
--      __u8 src[ETH_ALEN];
--      __u8 subtype;
--      __u8 reserved;
--      /* "4 bytes boundary + 2 bytes" long to make the payload after the
--       * following ethernet header again 4 bytes boundary aligned
--       */
--};
--
--/**
-- * struct batadv_frag_packet - fragmented packet
-- * @packet_type: batman-adv packet type, part of the general header
-- * @version: batman-adv protocol version, part of the genereal header
-- * @ttl: time to live for this packet, part of the genereal header
-- * @dest: final destination used when routing fragments
-- * @orig: originator of the fragment used when merging the packet
-- * @no: fragment number within this sequence
-- * @priority: priority of frame, from ToS IP precedence or 802.1p
-- * @reserved: reserved byte for alignment
-- * @seqno: sequence identification
-- * @total_size: size of the merged packet
-- */
--struct batadv_frag_packet {
--      __u8   packet_type;
--      __u8   version;  /* batman version field */
--      __u8   ttl;
--#if defined(__BIG_ENDIAN_BITFIELD)
--      __u8   no:4;
--      __u8   priority:3;
--      __u8   reserved:1;
--#elif defined(__LITTLE_ENDIAN_BITFIELD)
--      __u8   reserved:1;
--      __u8   priority:3;
--      __u8   no:4;
--#else
--#error "unknown bitfield endianness"
--#endif
--      __u8   dest[ETH_ALEN];
--      __u8   orig[ETH_ALEN];
--      __be16 seqno;
--      __be16 total_size;
--};
--
--/**
-- * struct batadv_bcast_packet - broadcast packet for network payload
-- * @packet_type: batman-adv packet type, part of the general header
-- * @version: batman-adv protocol version, part of the genereal header
-- * @ttl: time to live for this packet, part of the genereal header
-- * @reserved: reserved byte for alignment
-- * @seqno: sequence identification
-- * @orig: originator of the broadcast packet
-- */
--struct batadv_bcast_packet {
--      __u8   packet_type;
--      __u8   version;  /* batman version field */
--      __u8   ttl;
--      __u8   reserved;
--      __be32 seqno;
--      __u8   orig[ETH_ALEN];
--      /* "4 bytes boundary + 2 bytes" long to make the payload after the
--       * following ethernet header again 4 bytes boundary aligned
--       */
--};
--
--/**
-- * struct batadv_coded_packet - network coded packet
-- * @packet_type: batman-adv packet type, part of the general header
-- * @version: batman-adv protocol version, part of the genereal header
-- * @ttl: time to live for this packet, part of the genereal header
-- * @first_source: original source of first included packet
-- * @first_orig_dest: original destinal of first included packet
-- * @first_crc: checksum of first included packet
-- * @first_ttvn: tt-version number of first included packet
-- * @second_ttl: ttl of second packet
-- * @second_dest: second receiver of this coded packet
-- * @second_source: original source of second included packet
-- * @second_orig_dest: original destination of second included packet
-- * @second_crc: checksum of second included packet
-- * @second_ttvn: tt version number of second included packet
-- * @coded_len: length of network coded part of the payload
-- */
--struct batadv_coded_packet {
--      __u8   packet_type;
--      __u8   version;  /* batman version field */
--      __u8   ttl;
--      __u8   first_ttvn;
--      /* __u8 first_dest[ETH_ALEN]; - saved in mac header destination */
--      __u8   first_source[ETH_ALEN];
--      __u8   first_orig_dest[ETH_ALEN];
--      __be32 first_crc;
--      __u8   second_ttl;
--      __u8   second_ttvn;
--      __u8   second_dest[ETH_ALEN];
--      __u8   second_source[ETH_ALEN];
--      __u8   second_orig_dest[ETH_ALEN];
--      __be32 second_crc;
--      __be16 coded_len;
--};
--
--#pragma pack()
--
--/**
-- * struct batadv_unicast_tvlv_packet - generic unicast packet with tvlv payload
-- * @packet_type: batman-adv packet type, part of the general header
-- * @version: batman-adv protocol version, part of the genereal header
-- * @ttl: time to live for this packet, part of the genereal header
-- * @reserved: reserved field (for packet alignment)
-- * @src: address of the source
-- * @dst: address of the destination
-- * @tvlv_len: length of tvlv data following the unicast tvlv header
-- * @align: 2 bytes to align the header to a 4 byte boundary
-- */
--struct batadv_unicast_tvlv_packet {
--      __u8   packet_type;
--      __u8   version;  /* batman version field */
--      __u8   ttl;
--      __u8   reserved;
--      __u8   dst[ETH_ALEN];
--      __u8   src[ETH_ALEN];
--      __be16 tvlv_len;
--      __u16  align;
--};
--
--/**
-- * struct batadv_tvlv_hdr - base tvlv header struct
-- * @type: tvlv container type (see batadv_tvlv_type)
-- * @version: tvlv container version
-- * @len: tvlv container length
-- */
--struct batadv_tvlv_hdr {
--      __u8   type;
--      __u8   version;
--      __be16 len;
--};
--
--/**
-- * struct batadv_tvlv_gateway_data - gateway data propagated through gw tvlv
-- *  container
-- * @bandwidth_down: advertised uplink download bandwidth
-- * @bandwidth_up: advertised uplink upload bandwidth
-- */
--struct batadv_tvlv_gateway_data {
--      __be32 bandwidth_down;
--      __be32 bandwidth_up;
--};
--
--/**
-- * struct batadv_tvlv_tt_data - tt data propagated through the tt tvlv container
-- * @flags: translation table flags (see batadv_tt_data_flags)
-- * @ttvn: translation table version number
-- * @num_vlan: number of announced VLANs. In the TVLV this struct is followed by
-- *  one batadv_tvlv_tt_vlan_data object per announced vlan
-- */
--struct batadv_tvlv_tt_data {
--      __u8   flags;
--      __u8   ttvn;
--      __be16 num_vlan;
--};
--
--/**
-- * struct batadv_tvlv_tt_vlan_data - vlan specific tt data propagated through
-- *  the tt tvlv container
-- * @crc: crc32 checksum of the entries belonging to this vlan
-- * @vid: vlan identifier
-- * @reserved: unused, useful for alignment purposes
-- */
--struct batadv_tvlv_tt_vlan_data {
--      __be32 crc;
--      __be16 vid;
--      __u16  reserved;
--};
--
--/**
-- * struct batadv_tvlv_tt_change - translation table diff data
-- * @flags: status indicators concerning the non-mesh client (see
-- *  batadv_tt_client_flags)
-- * @reserved: reserved field - useful for alignment purposes only
-- * @addr: mac address of non-mesh client that triggered this tt change
-- * @vid: VLAN identifier
-- */
--struct batadv_tvlv_tt_change {
--      __u8   flags;
--      __u8   reserved[3];
--      __u8   addr[ETH_ALEN];
--      __be16 vid;
--};
--
--/**
-- * struct batadv_tvlv_roam_adv - roaming advertisement
-- * @client: mac address of roaming client
-- * @vid: VLAN identifier
-- */
--struct batadv_tvlv_roam_adv {
--      __u8   client[ETH_ALEN];
--      __be16 vid;
--};
--
--/**
-- * struct batadv_tvlv_mcast_data - payload of a multicast tvlv
-- * @flags: multicast flags announced by the orig node
-- * @reserved: reserved field
-- */
--struct batadv_tvlv_mcast_data {
--      __u8 flags;
--      __u8 reserved[3];
--};
--
--#endif /* _NET_BATMAN_ADV_PACKET_H_ */
---- a/net/batman-adv/routing.c
-+++ b/net/batman-adv/routing.c
-@@ -33,6 +33,7 @@
- #include <linux/skbuff.h>
- #include <linux/spinlock.h>
- #include <linux/stddef.h>
-+#include <uapi/linux/batadv_packet.h>
- #include "bitarray.h"
- #include "bridge_loop_avoidance.h"
-@@ -43,7 +44,6 @@
- #include "log.h"
- #include "network-coding.h"
- #include "originator.h"
--#include "packet.h"
- #include "send.h"
- #include "soft-interface.h"
- #include "tp_meter.h"
---- a/net/batman-adv/send.h
-+++ b/net/batman-adv/send.h
-@@ -23,8 +23,7 @@
- #include <linux/compiler.h>
- #include <linux/spinlock.h>
- #include <linux/types.h>
--
--#include "packet.h"
-+#include <uapi/linux/batadv_packet.h>
- struct sk_buff;
---- a/net/batman-adv/soft-interface.c
-+++ b/net/batman-adv/soft-interface.c
-@@ -48,6 +48,7 @@
- #include <linux/stddef.h>
- #include <linux/string.h>
- #include <linux/types.h>
-+#include <uapi/linux/batadv_packet.h>
- #include "bat_algo.h"
- #include "bridge_loop_avoidance.h"
-@@ -59,7 +60,6 @@
- #include "multicast.h"
- #include "network-coding.h"
- #include "originator.h"
--#include "packet.h"
- #include "send.h"
- #include "sysfs.h"
- #include "translation-table.h"
---- a/net/batman-adv/sysfs.c
-+++ b/net/batman-adv/sysfs.c
-@@ -37,6 +37,7 @@
- #include <linux/string.h>
- #include <linux/stringify.h>
- #include <linux/workqueue.h>
-+#include <uapi/linux/batadv_packet.h>
- #include "bridge_loop_avoidance.h"
- #include "distributed-arp-table.h"
-@@ -45,7 +46,6 @@
- #include "hard-interface.h"
- #include "log.h"
- #include "network-coding.h"
--#include "packet.h"
- #include "soft-interface.h"
- static struct net_device *batadv_kobj_to_netdev(struct kobject *obj)
---- a/net/batman-adv/tp_meter.c
-+++ b/net/batman-adv/tp_meter.c
-@@ -48,13 +48,13 @@
- #include <linux/timer.h>
- #include <linux/wait.h>
- #include <linux/workqueue.h>
-+#include <uapi/linux/batadv_packet.h>
- #include <uapi/linux/batman_adv.h>
- #include "hard-interface.h"
- #include "log.h"
- #include "netlink.h"
- #include "originator.h"
--#include "packet.h"
- #include "send.h"
- /**
---- a/net/batman-adv/translation-table.c
-+++ b/net/batman-adv/translation-table.c
-@@ -50,6 +50,7 @@
- #include <net/genetlink.h>
- #include <net/netlink.h>
- #include <net/sock.h>
-+#include <uapi/linux/batadv_packet.h>
- #include <uapi/linux/batman_adv.h>
- #include "bridge_loop_avoidance.h"
-@@ -58,7 +59,6 @@
- #include "log.h"
- #include "netlink.h"
- #include "originator.h"
--#include "packet.h"
- #include "soft-interface.h"
- #include "tvlv.h"
---- a/net/batman-adv/tvlv.c
-+++ b/net/batman-adv/tvlv.c
-@@ -35,9 +35,9 @@
- #include <linux/stddef.h>
- #include <linux/string.h>
- #include <linux/types.h>
-+#include <uapi/linux/batadv_packet.h>
- #include "originator.h"
--#include "packet.h"
- #include "send.h"
- #include "tvlv.h"
---- a/net/batman-adv/types.h
-+++ b/net/batman-adv/types.h
-@@ -35,10 +35,9 @@
- #include <linux/types.h>
- #include <linux/wait.h>
- #include <linux/workqueue.h>
-+#include <uapi/linux/batadv_packet.h>
- #include <uapi/linux/batman_adv.h>
--#include "packet.h"
--
- struct seq_file;
- #ifdef CONFIG_BATMAN_ADV_DAT
---- /dev/null
-+++ b/include/uapi/linux/batadv_packet.h
-@@ -0,0 +1,623 @@
-+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */
-+/* Copyright (C) 2007-2017  B.A.T.M.A.N. contributors:
-+ *
-+ * Marek Lindner, Simon Wunderlich
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of version 2 of the GNU General Public
-+ * License as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef _UAPI_LINUX_BATADV_PACKET_H_
-+#define _UAPI_LINUX_BATADV_PACKET_H_
-+
-+#include <asm/byteorder.h>
-+#include <linux/if_ether.h>
-+#include <linux/types.h>
-+
-+#define batadv_tp_is_error(n) ((__u8)(n) > 127 ? 1 : 0)
-+
-+/**
-+ * enum batadv_packettype - types for batman-adv encapsulated packets
-+ * @BATADV_IV_OGM: originator messages for B.A.T.M.A.N. IV
-+ * @BATADV_BCAST: broadcast packets carrying broadcast payload
-+ * @BATADV_CODED: network coded packets
-+ * @BATADV_ELP: echo location packets for B.A.T.M.A.N. V
-+ * @BATADV_OGM2: originator messages for B.A.T.M.A.N. V
-+ *
-+ * @BATADV_UNICAST: unicast packets carrying unicast payload traffic
-+ * @BATADV_UNICAST_FRAG: unicast packets carrying a fragment of the original
-+ *     payload packet
-+ * @BATADV_UNICAST_4ADDR: unicast packet including the originator address of
-+ *     the sender
-+ * @BATADV_ICMP: unicast packet like IP ICMP used for ping or traceroute
-+ * @BATADV_UNICAST_TVLV: unicast packet carrying TVLV containers
-+ */
-+enum batadv_packettype {
-+      /* 0x00 - 0x3f: local packets or special rules for handling */
-+      BATADV_IV_OGM           = 0x00,
-+      BATADV_BCAST            = 0x01,
-+      BATADV_CODED            = 0x02,
-+      BATADV_ELP              = 0x03,
-+      BATADV_OGM2             = 0x04,
-+      /* 0x40 - 0x7f: unicast */
-+#define BATADV_UNICAST_MIN     0x40
-+      BATADV_UNICAST          = 0x40,
-+      BATADV_UNICAST_FRAG     = 0x41,
-+      BATADV_UNICAST_4ADDR    = 0x42,
-+      BATADV_ICMP             = 0x43,
-+      BATADV_UNICAST_TVLV     = 0x44,
-+#define BATADV_UNICAST_MAX     0x7f
-+      /* 0x80 - 0xff: reserved */
-+};
-+
-+/**
-+ * enum batadv_subtype - packet subtype for unicast4addr
-+ * @BATADV_P_DATA: user payload
-+ * @BATADV_P_DAT_DHT_GET: DHT request message
-+ * @BATADV_P_DAT_DHT_PUT: DHT store message
-+ * @BATADV_P_DAT_CACHE_REPLY: ARP reply generated by DAT
-+ */
-+enum batadv_subtype {
-+      BATADV_P_DATA                   = 0x01,
-+      BATADV_P_DAT_DHT_GET            = 0x02,
-+      BATADV_P_DAT_DHT_PUT            = 0x03,
-+      BATADV_P_DAT_CACHE_REPLY        = 0x04,
-+};
-+
-+/* this file is included by batctl which needs these defines */
-+#define BATADV_COMPAT_VERSION 15
-+
-+/**
-+ * enum batadv_iv_flags - flags used in B.A.T.M.A.N. IV OGM packets
-+ * @BATADV_NOT_BEST_NEXT_HOP: flag is set when ogm packet is forwarded and was
-+ *     previously received from someone else than the best neighbor.
-+ * @BATADV_PRIMARIES_FIRST_HOP: flag unused.
-+ * @BATADV_DIRECTLINK: flag is for the first hop or if rebroadcasted from a
-+ *     one hop neighbor on the interface where it was originally received.
-+ */
-+enum batadv_iv_flags {
-+      BATADV_NOT_BEST_NEXT_HOP   = 1UL << 0,
-+      BATADV_PRIMARIES_FIRST_HOP = 1UL << 1,
-+      BATADV_DIRECTLINK          = 1UL << 2,
-+};
-+
-+/* ICMP message types */
-+enum batadv_icmp_packettype {
-+      BATADV_ECHO_REPLY              = 0,
-+      BATADV_DESTINATION_UNREACHABLE = 3,
-+      BATADV_ECHO_REQUEST            = 8,
-+      BATADV_TTL_EXCEEDED            = 11,
-+      BATADV_PARAMETER_PROBLEM       = 12,
-+      BATADV_TP                      = 15,
-+};
-+
-+/**
-+ * enum batadv_mcast_flags - flags for multicast capabilities and settings
-+ * @BATADV_MCAST_WANT_ALL_UNSNOOPABLES: we want all packets destined for
-+ *  224.0.0.0/24 or ff02::1
-+ * @BATADV_MCAST_WANT_ALL_IPV4: we want all IPv4 multicast packets
-+ * @BATADV_MCAST_WANT_ALL_IPV6: we want all IPv6 multicast packets
-+ */
-+enum batadv_mcast_flags {
-+      BATADV_MCAST_WANT_ALL_UNSNOOPABLES      = 1UL << 0,
-+      BATADV_MCAST_WANT_ALL_IPV4              = 1UL << 1,
-+      BATADV_MCAST_WANT_ALL_IPV6              = 1UL << 2,
-+};
-+
-+/* tt data subtypes */
-+#define BATADV_TT_DATA_TYPE_MASK 0x0F
-+
-+/**
-+ * enum batadv_tt_data_flags - flags for tt data tvlv
-+ * @BATADV_TT_OGM_DIFF: TT diff propagated through OGM
-+ * @BATADV_TT_REQUEST: TT request message
-+ * @BATADV_TT_RESPONSE: TT response message
-+ * @BATADV_TT_FULL_TABLE: contains full table to replace existing table
-+ */
-+enum batadv_tt_data_flags {
-+      BATADV_TT_OGM_DIFF   = 1UL << 0,
-+      BATADV_TT_REQUEST    = 1UL << 1,
-+      BATADV_TT_RESPONSE   = 1UL << 2,
-+      BATADV_TT_FULL_TABLE = 1UL << 4,
-+};
-+
-+/**
-+ * enum batadv_vlan_flags - flags for the four MSB of any vlan ID field
-+ * @BATADV_VLAN_HAS_TAG: whether the field contains a valid vlan tag or not
-+ */
-+enum batadv_vlan_flags {
-+      BATADV_VLAN_HAS_TAG     = 1UL << 15,
-+};
-+
-+/* claim frame types for the bridge loop avoidance */
-+enum batadv_bla_claimframe {
-+      BATADV_CLAIM_TYPE_CLAIM         = 0x00,
-+      BATADV_CLAIM_TYPE_UNCLAIM       = 0x01,
-+      BATADV_CLAIM_TYPE_ANNOUNCE      = 0x02,
-+      BATADV_CLAIM_TYPE_REQUEST       = 0x03,
-+      BATADV_CLAIM_TYPE_LOOPDETECT    = 0x04,
-+};
-+
-+/**
-+ * enum batadv_tvlv_type - tvlv type definitions
-+ * @BATADV_TVLV_GW: gateway tvlv
-+ * @BATADV_TVLV_DAT: distributed arp table tvlv
-+ * @BATADV_TVLV_NC: network coding tvlv
-+ * @BATADV_TVLV_TT: translation table tvlv
-+ * @BATADV_TVLV_ROAM: roaming advertisement tvlv
-+ * @BATADV_TVLV_MCAST: multicast capability tvlv
-+ */
-+enum batadv_tvlv_type {
-+      BATADV_TVLV_GW          = 0x01,
-+      BATADV_TVLV_DAT         = 0x02,
-+      BATADV_TVLV_NC          = 0x03,
-+      BATADV_TVLV_TT          = 0x04,
-+      BATADV_TVLV_ROAM        = 0x05,
-+      BATADV_TVLV_MCAST       = 0x06,
-+};
-+
-+#pragma pack(2)
-+/* the destination hardware field in the ARP frame is used to
-+ * transport the claim type and the group id
-+ */
-+struct batadv_bla_claim_dst {
-+      __u8   magic[3];        /* FF:43:05 */
-+      __u8   type;            /* bla_claimframe */
-+      __be16 group;           /* group id */
-+};
-+
-+#pragma pack()
-+
-+/**
-+ * struct batadv_ogm_packet - ogm (routing protocol) packet
-+ * @packet_type: batman-adv packet type, part of the general header
-+ * @version: batman-adv protocol version, part of the genereal header
-+ * @ttl: time to live for this packet, part of the genereal header
-+ * @flags: contains routing relevant flags - see enum batadv_iv_flags
-+ * @seqno: sequence identification
-+ * @orig: address of the source node
-+ * @prev_sender: address of the previous sender
-+ * @reserved: reserved byte for alignment
-+ * @tq: transmission quality
-+ * @tvlv_len: length of tvlv data following the ogm header
-+ */
-+struct batadv_ogm_packet {
-+      __u8   packet_type;
-+      __u8   version;
-+      __u8   ttl;
-+      __u8   flags;
-+      __be32 seqno;
-+      __u8   orig[ETH_ALEN];
-+      __u8   prev_sender[ETH_ALEN];
-+      __u8   reserved;
-+      __u8   tq;
-+      __be16 tvlv_len;
-+      /* __packed is not needed as the struct size is divisible by 4,
-+       * and the largest data type in this struct has a size of 4.
-+       */
-+};
-+
-+#define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet)
-+
-+/**
-+ * struct batadv_ogm2_packet - ogm2 (routing protocol) packet
-+ * @packet_type: batman-adv packet type, part of the general header
-+ * @version: batman-adv protocol version, part of the general header
-+ * @ttl: time to live for this packet, part of the general header
-+ * @flags: reseved for routing relevant flags - currently always 0
-+ * @seqno: sequence number
-+ * @orig: originator mac address
-+ * @tvlv_len: length of the appended tvlv buffer (in bytes)
-+ * @throughput: the currently flooded path throughput
-+ */
-+struct batadv_ogm2_packet {
-+      __u8   packet_type;
-+      __u8   version;
-+      __u8   ttl;
-+      __u8   flags;
-+      __be32 seqno;
-+      __u8   orig[ETH_ALEN];
-+      __be16 tvlv_len;
-+      __be32 throughput;
-+      /* __packed is not needed as the struct size is divisible by 4,
-+       * and the largest data type in this struct has a size of 4.
-+       */
-+};
-+
-+#define BATADV_OGM2_HLEN sizeof(struct batadv_ogm2_packet)
-+
-+/**
-+ * struct batadv_elp_packet - elp (neighbor discovery) packet
-+ * @packet_type: batman-adv packet type, part of the general header
-+ * @version: batman-adv protocol version, part of the genereal header
-+ * @orig: originator mac address
-+ * @seqno: sequence number
-+ * @elp_interval: currently used ELP sending interval in ms
-+ */
-+struct batadv_elp_packet {
-+      __u8   packet_type;
-+      __u8   version;
-+      __u8   orig[ETH_ALEN];
-+      __be32 seqno;
-+      __be32 elp_interval;
-+};
-+
-+#define BATADV_ELP_HLEN sizeof(struct batadv_elp_packet)
-+
-+/**
-+ * struct batadv_icmp_header - common members among all the ICMP packets
-+ * @packet_type: batman-adv packet type, part of the general header
-+ * @version: batman-adv protocol version, part of the genereal header
-+ * @ttl: time to live for this packet, part of the genereal header
-+ * @msg_type: ICMP packet type
-+ * @dst: address of the destination node
-+ * @orig: address of the source node
-+ * @uid: local ICMP socket identifier
-+ * @align: not used - useful for alignment purposes only
-+ *
-+ * This structure is used for ICMP packets parsing only and it is never sent
-+ * over the wire. The alignment field at the end is there to ensure that
-+ * members are padded the same way as they are in real packets.
-+ */
-+struct batadv_icmp_header {
-+      __u8 packet_type;
-+      __u8 version;
-+      __u8 ttl;
-+      __u8 msg_type; /* see ICMP message types above */
-+      __u8 dst[ETH_ALEN];
-+      __u8 orig[ETH_ALEN];
-+      __u8 uid;
-+      __u8 align[3];
-+};
-+
-+/**
-+ * struct batadv_icmp_packet - ICMP packet
-+ * @packet_type: batman-adv packet type, part of the general header
-+ * @version: batman-adv protocol version, part of the genereal header
-+ * @ttl: time to live for this packet, part of the genereal header
-+ * @msg_type: ICMP packet type
-+ * @dst: address of the destination node
-+ * @orig: address of the source node
-+ * @uid: local ICMP socket identifier
-+ * @reserved: not used - useful for alignment
-+ * @seqno: ICMP sequence number
-+ */
-+struct batadv_icmp_packet {
-+      __u8   packet_type;
-+      __u8   version;
-+      __u8   ttl;
-+      __u8   msg_type; /* see ICMP message types above */
-+      __u8   dst[ETH_ALEN];
-+      __u8   orig[ETH_ALEN];
-+      __u8   uid;
-+      __u8   reserved;
-+      __be16 seqno;
-+};
-+
-+/**
-+ * struct batadv_icmp_tp_packet - ICMP TP Meter packet
-+ * @packet_type: batman-adv packet type, part of the general header
-+ * @version: batman-adv protocol version, part of the genereal header
-+ * @ttl: time to live for this packet, part of the genereal header
-+ * @msg_type: ICMP packet type
-+ * @dst: address of the destination node
-+ * @orig: address of the source node
-+ * @uid: local ICMP socket identifier
-+ * @subtype: TP packet subtype (see batadv_icmp_tp_subtype)
-+ * @session: TP session identifier
-+ * @seqno: the TP sequence number
-+ * @timestamp: time when the packet has been sent. This value is filled in a
-+ *  TP_MSG and echoed back in the next TP_ACK so that the sender can compute the
-+ *  RTT. Since it is read only by the host which wrote it, there is no need to
-+ *  store it using network order
-+ */
-+struct batadv_icmp_tp_packet {
-+      __u8   packet_type;
-+      __u8   version;
-+      __u8   ttl;
-+      __u8   msg_type; /* see ICMP message types above */
-+      __u8   dst[ETH_ALEN];
-+      __u8   orig[ETH_ALEN];
-+      __u8   uid;
-+      __u8   subtype;
-+      __u8   session[2];
-+      __be32 seqno;
-+      __be32 timestamp;
-+};
-+
-+/**
-+ * enum batadv_icmp_tp_subtype - ICMP TP Meter packet subtypes
-+ * @BATADV_TP_MSG: Msg from sender to receiver
-+ * @BATADV_TP_ACK: acknowledgment from receiver to sender
-+ */
-+enum batadv_icmp_tp_subtype {
-+      BATADV_TP_MSG   = 0,
-+      BATADV_TP_ACK,
-+};
-+
-+#define BATADV_RR_LEN 16
-+
-+/**
-+ * struct batadv_icmp_packet_rr - ICMP RouteRecord packet
-+ * @packet_type: batman-adv packet type, part of the general header
-+ * @version: batman-adv protocol version, part of the genereal header
-+ * @ttl: time to live for this packet, part of the genereal header
-+ * @msg_type: ICMP packet type
-+ * @dst: address of the destination node
-+ * @orig: address of the source node
-+ * @uid: local ICMP socket identifier
-+ * @rr_cur: number of entries the rr array
-+ * @seqno: ICMP sequence number
-+ * @rr: route record array
-+ */
-+struct batadv_icmp_packet_rr {
-+      __u8   packet_type;
-+      __u8   version;
-+      __u8   ttl;
-+      __u8   msg_type; /* see ICMP message types above */
-+      __u8   dst[ETH_ALEN];
-+      __u8   orig[ETH_ALEN];
-+      __u8   uid;
-+      __u8   rr_cur;
-+      __be16 seqno;
-+      __u8   rr[BATADV_RR_LEN][ETH_ALEN];
-+};
-+
-+#define BATADV_ICMP_MAX_PACKET_SIZE   sizeof(struct batadv_icmp_packet_rr)
-+
-+/* All packet headers in front of an ethernet header have to be completely
-+ * divisible by 2 but not by 4 to make the payload after the ethernet
-+ * header again 4 bytes boundary aligned.
-+ *
-+ * A packing of 2 is necessary to avoid extra padding at the end of the struct
-+ * caused by a structure member which is larger than two bytes. Otherwise
-+ * the structure would not fulfill the previously mentioned rule to avoid the
-+ * misalignment of the payload after the ethernet header. It may also lead to
-+ * leakage of information when the padding it not initialized before sending.
-+ */
-+#pragma pack(2)
-+
-+/**
-+ * struct batadv_unicast_packet - unicast packet for network payload
-+ * @packet_type: batman-adv packet type, part of the general header
-+ * @version: batman-adv protocol version, part of the genereal header
-+ * @ttl: time to live for this packet, part of the genereal header
-+ * @ttvn: translation table version number
-+ * @dest: originator destination of the unicast packet
-+ */
-+struct batadv_unicast_packet {
-+      __u8 packet_type;
-+      __u8 version;
-+      __u8 ttl;
-+      __u8 ttvn; /* destination translation table version number */
-+      __u8 dest[ETH_ALEN];
-+      /* "4 bytes boundary + 2 bytes" long to make the payload after the
-+       * following ethernet header again 4 bytes boundary aligned
-+       */
-+};
-+
-+/**
-+ * struct batadv_unicast_4addr_packet - extended unicast packet
-+ * @u: common unicast packet header
-+ * @src: address of the source
-+ * @subtype: packet subtype
-+ * @reserved: reserved byte for alignment
-+ */
-+struct batadv_unicast_4addr_packet {
-+      struct batadv_unicast_packet u;
-+      __u8 src[ETH_ALEN];
-+      __u8 subtype;
-+      __u8 reserved;
-+      /* "4 bytes boundary + 2 bytes" long to make the payload after the
-+       * following ethernet header again 4 bytes boundary aligned
-+       */
-+};
-+
-+/**
-+ * struct batadv_frag_packet - fragmented packet
-+ * @packet_type: batman-adv packet type, part of the general header
-+ * @version: batman-adv protocol version, part of the genereal header
-+ * @ttl: time to live for this packet, part of the genereal header
-+ * @dest: final destination used when routing fragments
-+ * @orig: originator of the fragment used when merging the packet
-+ * @no: fragment number within this sequence
-+ * @priority: priority of frame, from ToS IP precedence or 802.1p
-+ * @reserved: reserved byte for alignment
-+ * @seqno: sequence identification
-+ * @total_size: size of the merged packet
-+ */
-+struct batadv_frag_packet {
-+      __u8   packet_type;
-+      __u8   version;  /* batman version field */
-+      __u8   ttl;
-+#if defined(__BIG_ENDIAN_BITFIELD)
-+      __u8   no:4;
-+      __u8   priority:3;
-+      __u8   reserved:1;
-+#elif defined(__LITTLE_ENDIAN_BITFIELD)
-+      __u8   reserved:1;
-+      __u8   priority:3;
-+      __u8   no:4;
-+#else
-+#error "unknown bitfield endianness"
-+#endif
-+      __u8   dest[ETH_ALEN];
-+      __u8   orig[ETH_ALEN];
-+      __be16 seqno;
-+      __be16 total_size;
-+};
-+
-+/**
-+ * struct batadv_bcast_packet - broadcast packet for network payload
-+ * @packet_type: batman-adv packet type, part of the general header
-+ * @version: batman-adv protocol version, part of the genereal header
-+ * @ttl: time to live for this packet, part of the genereal header
-+ * @reserved: reserved byte for alignment
-+ * @seqno: sequence identification
-+ * @orig: originator of the broadcast packet
-+ */
-+struct batadv_bcast_packet {
-+      __u8   packet_type;
-+      __u8   version;  /* batman version field */
-+      __u8   ttl;
-+      __u8   reserved;
-+      __be32 seqno;
-+      __u8   orig[ETH_ALEN];
-+      /* "4 bytes boundary + 2 bytes" long to make the payload after the
-+       * following ethernet header again 4 bytes boundary aligned
-+       */
-+};
-+
-+/**
-+ * struct batadv_coded_packet - network coded packet
-+ * @packet_type: batman-adv packet type, part of the general header
-+ * @version: batman-adv protocol version, part of the genereal header
-+ * @ttl: time to live for this packet, part of the genereal header
-+ * @first_source: original source of first included packet
-+ * @first_orig_dest: original destinal of first included packet
-+ * @first_crc: checksum of first included packet
-+ * @first_ttvn: tt-version number of first included packet
-+ * @second_ttl: ttl of second packet
-+ * @second_dest: second receiver of this coded packet
-+ * @second_source: original source of second included packet
-+ * @second_orig_dest: original destination of second included packet
-+ * @second_crc: checksum of second included packet
-+ * @second_ttvn: tt version number of second included packet
-+ * @coded_len: length of network coded part of the payload
-+ */
-+struct batadv_coded_packet {
-+      __u8   packet_type;
-+      __u8   version;  /* batman version field */
-+      __u8   ttl;
-+      __u8   first_ttvn;
-+      /* __u8 first_dest[ETH_ALEN]; - saved in mac header destination */
-+      __u8   first_source[ETH_ALEN];
-+      __u8   first_orig_dest[ETH_ALEN];
-+      __be32 first_crc;
-+      __u8   second_ttl;
-+      __u8   second_ttvn;
-+      __u8   second_dest[ETH_ALEN];
-+      __u8   second_source[ETH_ALEN];
-+      __u8   second_orig_dest[ETH_ALEN];
-+      __be32 second_crc;
-+      __be16 coded_len;
-+};
-+
-+#pragma pack()
-+
-+/**
-+ * struct batadv_unicast_tvlv_packet - generic unicast packet with tvlv payload
-+ * @packet_type: batman-adv packet type, part of the general header
-+ * @version: batman-adv protocol version, part of the genereal header
-+ * @ttl: time to live for this packet, part of the genereal header
-+ * @reserved: reserved field (for packet alignment)
-+ * @src: address of the source
-+ * @dst: address of the destination
-+ * @tvlv_len: length of tvlv data following the unicast tvlv header
-+ * @align: 2 bytes to align the header to a 4 byte boundary
-+ */
-+struct batadv_unicast_tvlv_packet {
-+      __u8   packet_type;
-+      __u8   version;  /* batman version field */
-+      __u8   ttl;
-+      __u8   reserved;
-+      __u8   dst[ETH_ALEN];
-+      __u8   src[ETH_ALEN];
-+      __be16 tvlv_len;
-+      __u16  align;
-+};
-+
-+/**
-+ * struct batadv_tvlv_hdr - base tvlv header struct
-+ * @type: tvlv container type (see batadv_tvlv_type)
-+ * @version: tvlv container version
-+ * @len: tvlv container length
-+ */
-+struct batadv_tvlv_hdr {
-+      __u8   type;
-+      __u8   version;
-+      __be16 len;
-+};
-+
-+/**
-+ * struct batadv_tvlv_gateway_data - gateway data propagated through gw tvlv
-+ *  container
-+ * @bandwidth_down: advertised uplink download bandwidth
-+ * @bandwidth_up: advertised uplink upload bandwidth
-+ */
-+struct batadv_tvlv_gateway_data {
-+      __be32 bandwidth_down;
-+      __be32 bandwidth_up;
-+};
-+
-+/**
-+ * struct batadv_tvlv_tt_data - tt data propagated through the tt tvlv container
-+ * @flags: translation table flags (see batadv_tt_data_flags)
-+ * @ttvn: translation table version number
-+ * @num_vlan: number of announced VLANs. In the TVLV this struct is followed by
-+ *  one batadv_tvlv_tt_vlan_data object per announced vlan
-+ */
-+struct batadv_tvlv_tt_data {
-+      __u8   flags;
-+      __u8   ttvn;
-+      __be16 num_vlan;
-+};
-+
-+/**
-+ * struct batadv_tvlv_tt_vlan_data - vlan specific tt data propagated through
-+ *  the tt tvlv container
-+ * @crc: crc32 checksum of the entries belonging to this vlan
-+ * @vid: vlan identifier
-+ * @reserved: unused, useful for alignment purposes
-+ */
-+struct batadv_tvlv_tt_vlan_data {
-+      __be32 crc;
-+      __be16 vid;
-+      __u16  reserved;
-+};
-+
-+/**
-+ * struct batadv_tvlv_tt_change - translation table diff data
-+ * @flags: status indicators concerning the non-mesh client (see
-+ *  batadv_tt_client_flags)
-+ * @reserved: reserved field - useful for alignment purposes only
-+ * @addr: mac address of non-mesh client that triggered this tt change
-+ * @vid: VLAN identifier
-+ */
-+struct batadv_tvlv_tt_change {
-+      __u8   flags;
-+      __u8   reserved[3];
-+      __u8   addr[ETH_ALEN];
-+      __be16 vid;
-+};
-+
-+/**
-+ * struct batadv_tvlv_roam_adv - roaming advertisement
-+ * @client: mac address of roaming client
-+ * @vid: VLAN identifier
-+ */
-+struct batadv_tvlv_roam_adv {
-+      __u8   client[ETH_ALEN];
-+      __be16 vid;
-+};
-+
-+/**
-+ * struct batadv_tvlv_mcast_data - payload of a multicast tvlv
-+ * @flags: multicast flags announced by the orig node
-+ * @reserved: reserved field
-+ */
-+struct batadv_tvlv_mcast_data {
-+      __u8 flags;
-+      __u8 reserved[3];
-+};
-+
-+#endif /* _UAPI_LINUX_BATADV_PACKET_H_ */
diff --git a/target/linux/generic/backport-4.14/274-flow_dissector-Parse-batman-adv-unicast-headers.patch b/target/linux/generic/backport-4.14/274-flow_dissector-Parse-batman-adv-unicast-headers.patch
deleted file mode 100644 (file)
index a9b2fc4..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-From: Sven Eckelmann <sven.eckelmann@openmesh.com>
-Date: Thu, 21 Dec 2017 10:17:42 +0100
-Subject: [PATCH] flow_dissector: Parse batman-adv unicast headers
-
-The batman-adv unicast packets contain a full layer 2 frame in encapsulated
-form. The flow dissector must therefore be able to parse the batman-adv
-unicast header to reach the layer 2+3 information.
-
-  +--------------------+
-  | ip(v6)hdr          |
-  +--------------------+
-  | inner ethhdr       |
-  +--------------------+
-  | batadv unicast hdr |
-  +--------------------+
-  | outer ethhdr       |
-  +--------------------+
-
-The obtained information from the upper layer can then be used by RPS to
-schedule the processing on separate cores. This allows better distribution
-of multiple flows from the same neighbor to different cores.
-
-Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
-Reviewed-by: Jiri Pirko <jiri@mellanox.com>
-Acked-by: Willem de Bruijn <willemb@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/net/core/flow_dissector.c
-+++ b/net/core/flow_dissector.c
-@@ -22,6 +22,7 @@
- #include <linux/tcp.h>
- #include <net/flow_dissector.h>
- #include <scsi/fc/fc_fcoe.h>
-+#include <uapi/linux/batadv_packet.h>
- static void dissector_set_key(struct flow_dissector *flow_dissector,
-                             enum flow_dissector_key_id key_id)
-@@ -338,6 +339,57 @@ __skb_flow_dissect_gre(const struct sk_b
-       return FLOW_DISSECT_RET_PROTO_AGAIN;
- }
-+/**
-+ * __skb_flow_dissect_batadv() - dissect batman-adv header
-+ * @skb: sk_buff to with the batman-adv header
-+ * @key_control: flow dissectors control key
-+ * @data: raw buffer pointer to the packet, if NULL use skb->data
-+ * @p_proto: pointer used to update the protocol to process next
-+ * @p_nhoff: pointer used to update inner network header offset
-+ * @hlen: packet header length
-+ * @flags: any combination of FLOW_DISSECTOR_F_*
-+ *
-+ * ETH_P_BATMAN packets are tried to be dissected. Only
-+ * &struct batadv_unicast packets are actually processed because they contain an
-+ * inner ethernet header and are usually followed by actual network header. This
-+ * allows the flow dissector to continue processing the packet.
-+ *
-+ * Return: FLOW_DISSECT_RET_PROTO_AGAIN when &struct batadv_unicast was found,
-+ *  FLOW_DISSECT_RET_OUT_GOOD when dissector should stop after encapsulation,
-+ *  otherwise FLOW_DISSECT_RET_OUT_BAD
-+ */
-+static enum flow_dissect_ret
-+__skb_flow_dissect_batadv(const struct sk_buff *skb,
-+                        struct flow_dissector_key_control *key_control,
-+                        void *data, __be16 *p_proto, int *p_nhoff, int hlen,
-+                        unsigned int flags)
-+{
-+      struct {
-+              struct batadv_unicast_packet batadv_unicast;
-+              struct ethhdr eth;
-+      } *hdr, _hdr;
-+
-+      hdr = __skb_header_pointer(skb, *p_nhoff, sizeof(_hdr), data, hlen,
-+                                 &_hdr);
-+      if (!hdr)
-+              return FLOW_DISSECT_RET_OUT_BAD;
-+
-+      if (hdr->batadv_unicast.version != BATADV_COMPAT_VERSION)
-+              return FLOW_DISSECT_RET_OUT_BAD;
-+
-+      if (hdr->batadv_unicast.packet_type != BATADV_UNICAST)
-+              return FLOW_DISSECT_RET_OUT_BAD;
-+
-+      *p_proto = hdr->eth.h_proto;
-+      *p_nhoff += sizeof(*hdr);
-+
-+      key_control->flags |= FLOW_DIS_ENCAPSULATION;
-+      if (flags & FLOW_DISSECTOR_F_STOP_AT_ENCAP)
-+              return FLOW_DISSECT_RET_OUT_GOOD;
-+
-+      return FLOW_DISSECT_RET_PROTO_AGAIN;
-+}
-+
- static void
- __skb_flow_dissect_tcp(const struct sk_buff *skb,
-                      struct flow_dissector *flow_dissector,
-@@ -718,6 +770,11 @@ proto_again:
-                                              nhoff, hlen);
-               break;
-+      case htons(ETH_P_BATMAN):
-+              fdret = __skb_flow_dissect_batadv(skb, key_control, data,
-+                                                &proto, &nhoff, hlen, flags);
-+              break;
-+
-       default:
-               fdret = FLOW_DISSECT_RET_OUT_BAD;
-               break;
diff --git a/target/linux/generic/backport-4.14/289-v4.16-netfilter-add-defines-for-arp-decnet-max-hooks.patch b/target/linux/generic/backport-4.14/289-v4.16-netfilter-add-defines-for-arp-decnet-max-hooks.patch
deleted file mode 100644 (file)
index f7898d4..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-From e58f33cc84bc089c430ac955f3cad6380ae98591 Mon Sep 17 00:00:00 2001
-From: Florian Westphal <fw@strlen.de>
-Date: Thu, 7 Dec 2017 16:28:23 +0100
-Subject: [PATCH] netfilter: add defines for arp/decnet max hooks
-
-The kernel already has defines for this, but they are in uapi exposed
-headers.
-
-Including these from netns.h causes build errors and also adds unneeded
-dependencies on heads that we don't need.
-
-So move these defines to netfilter_defs.h and place the uapi ones
-in ifndef __KERNEL__ to keep them for userspace.
-
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- include/linux/netfilter_defs.h        | 6 ++++++
- include/uapi/linux/netfilter_arp.h    | 3 +++
- include/uapi/linux/netfilter_decnet.h | 4 +++-
- 3 files changed, 12 insertions(+), 1 deletion(-)
-
---- a/include/linux/netfilter_defs.h
-+++ b/include/linux/netfilter_defs.h
-@@ -7,4 +7,10 @@
- /* Largest hook number + 1, see uapi/linux/netfilter_decnet.h */
- #define NF_MAX_HOOKS 8
-+/* in/out/forward only */
-+#define NF_ARP_NUMHOOKS 3
-+
-+/* max hook is NF_DN_ROUTE (6), also see uapi/linux/netfilter_decnet.h */
-+#define NF_DN_NUMHOOKS 7
-+
- #endif
---- a/include/uapi/linux/netfilter_arp.h
-+++ b/include/uapi/linux/netfilter_arp.h
-@@ -15,6 +15,9 @@
- #define NF_ARP_IN     0
- #define NF_ARP_OUT    1
- #define NF_ARP_FORWARD        2
-+
-+#ifndef __KERNEL__
- #define NF_ARP_NUMHOOKS       3
-+#endif
- #endif /* __LINUX_ARP_NETFILTER_H */
---- a/include/uapi/linux/netfilter_decnet.h
-+++ b/include/uapi/linux/netfilter_decnet.h
-@@ -24,6 +24,9 @@
- #define NFC_DN_IF_IN          0x0004
- /* Output device. */
- #define NFC_DN_IF_OUT         0x0008
-+
-+/* kernel define is in netfilter_defs.h */
-+#define NF_DN_NUMHOOKS                7
- #endif /* ! __KERNEL__ */
- /* DECnet Hooks */
-@@ -41,7 +44,6 @@
- #define NF_DN_HELLO           5
- /* Input Routing Packets */
- #define NF_DN_ROUTE           6
--#define NF_DN_NUMHOOKS                7
- enum nf_dn_hook_priorities {
-       NF_DN_PRI_FIRST = INT_MIN,
diff --git a/target/linux/generic/backport-4.14/290-v4.16-netfilter-core-make-nf_unregister_net_hooks-simple-w.patch b/target/linux/generic/backport-4.14/290-v4.16-netfilter-core-make-nf_unregister_net_hooks-simple-w.patch
deleted file mode 100644 (file)
index 35800c4..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-From 4e645b47c4f000a503b9c90163ad905786b9bc1d Mon Sep 17 00:00:00 2001
-From: Florian Westphal <fw@strlen.de>
-Date: Fri, 1 Dec 2017 00:21:02 +0100
-Subject: [PATCH 02/11] netfilter: core: make nf_unregister_net_hooks simple
- wrapper again
-
-This reverts commit d3ad2c17b4047
-("netfilter: core: batch nf_unregister_net_hooks synchronize_net calls").
-
-Nothing wrong with it.  However, followup patch will delay freeing of hooks
-with call_rcu, so all synchronize_net() calls become obsolete and there
-is no need anymore for this batching.
-
-This revert causes a temporary performance degradation when destroying
-network namespace, but its resolved with the upcoming call_rcu conversion.
-
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- net/netfilter/core.c | 59 +++-------------------------------------------------
- 1 file changed, 3 insertions(+), 56 deletions(-)
-
---- a/net/netfilter/core.c
-+++ b/net/netfilter/core.c
-@@ -395,63 +395,10 @@ EXPORT_SYMBOL(nf_register_net_hooks);
- void nf_unregister_net_hooks(struct net *net, const struct nf_hook_ops *reg,
-                            unsigned int hookcount)
- {
--      struct nf_hook_entries *to_free[16], *p;
--      struct nf_hook_entries __rcu **pp;
--      unsigned int i, j, n;
-+      unsigned int i;
--      mutex_lock(&nf_hook_mutex);
--      for (i = 0; i < hookcount; i++) {
--              pp = nf_hook_entry_head(net, &reg[i]);
--              if (!pp)
--                      continue;
--
--              p = nf_entry_dereference(*pp);
--              if (WARN_ON_ONCE(!p))
--                      continue;
--              __nf_unregister_net_hook(p, &reg[i]);
--      }
--      mutex_unlock(&nf_hook_mutex);
--
--      do {
--              n = min_t(unsigned int, hookcount, ARRAY_SIZE(to_free));
--
--              mutex_lock(&nf_hook_mutex);
--
--              for (i = 0, j = 0; i < hookcount && j < n; i++) {
--                      pp = nf_hook_entry_head(net, &reg[i]);
--                      if (!pp)
--                              continue;
--
--                      p = nf_entry_dereference(*pp);
--                      if (!p)
--                              continue;
--
--                      to_free[j] = __nf_hook_entries_try_shrink(pp);
--                      if (to_free[j])
--                              ++j;
--              }
--
--              mutex_unlock(&nf_hook_mutex);
--
--              if (j) {
--                      unsigned int nfq;
--
--                      synchronize_net();
--
--                      /* need 2nd synchronize_net() if nfqueue is used, skb
--                       * can get reinjected right before nf_queue_hook_drop()
--                       */
--                      nfq = nf_queue_nf_hook_drop(net);
--                      if (nfq)
--                              synchronize_net();
--
--                      for (i = 0; i < j; i++)
--                              kvfree(to_free[i]);
--              }
--
--              reg += n;
--              hookcount -= n;
--      } while (hookcount > 0);
-+      for (i = 0; i < hookcount; i++)
-+              nf_unregister_net_hook(net, &reg[i]);
- }
- EXPORT_SYMBOL(nf_unregister_net_hooks);
diff --git a/target/linux/generic/backport-4.14/291-v4.16-netfilter-core-remove-synchronize_net-call-if-nfqueu.patch b/target/linux/generic/backport-4.14/291-v4.16-netfilter-core-remove-synchronize_net-call-if-nfqueu.patch
deleted file mode 100644 (file)
index 0ac5783..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-From 26888dfd7e7454686b8d3ea9ba5045d5f236e4d7 Mon Sep 17 00:00:00 2001
-From: Florian Westphal <fw@strlen.de>
-Date: Fri, 1 Dec 2017 00:21:03 +0100
-Subject: [PATCH 03/11] netfilter: core: remove synchronize_net call if nfqueue
- is used
-
-since commit 960632ece6949b ("netfilter: convert hook list to an array")
-nfqueue no longer stores a pointer to the hook that caused the packet
-to be queued.  Therefore no extra synchronize_net() call is needed after
-dropping the packets enqueued by the old rule blob.
-
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- include/net/netfilter/nf_queue.h | 2 +-
- net/netfilter/core.c             | 6 +-----
- net/netfilter/nf_internals.h     | 2 +-
- net/netfilter/nf_queue.c         | 7 ++-----
- net/netfilter/nfnetlink_queue.c  | 9 ++-------
- 5 files changed, 7 insertions(+), 19 deletions(-)
-
---- a/include/net/netfilter/nf_queue.h
-+++ b/include/net/netfilter/nf_queue.h
-@@ -25,7 +25,7 @@ struct nf_queue_entry {
- struct nf_queue_handler {
-       int             (*outfn)(struct nf_queue_entry *entry,
-                                unsigned int queuenum);
--      unsigned int    (*nf_hook_drop)(struct net *net);
-+      void            (*nf_hook_drop)(struct net *net);
- };
- void nf_register_queue_handler(struct net *net, const struct nf_queue_handler *qh);
---- a/net/netfilter/core.c
-+++ b/net/netfilter/core.c
-@@ -341,7 +341,6 @@ void nf_unregister_net_hook(struct net *
- {
-       struct nf_hook_entries __rcu **pp;
-       struct nf_hook_entries *p;
--      unsigned int nfq;
-       pp = nf_hook_entry_head(net, reg);
-       if (!pp)
-@@ -364,10 +363,7 @@ void nf_unregister_net_hook(struct net *
-       synchronize_net();
--      /* other cpu might still process nfqueue verdict that used reg */
--      nfq = nf_queue_nf_hook_drop(net);
--      if (nfq)
--              synchronize_net();
-+      nf_queue_nf_hook_drop(net);
-       kvfree(p);
- }
- EXPORT_SYMBOL(nf_unregister_net_hook);
---- a/net/netfilter/nf_internals.h
-+++ b/net/netfilter/nf_internals.h
-@@ -10,7 +10,7 @@
- int nf_queue(struct sk_buff *skb, struct nf_hook_state *state,
-            const struct nf_hook_entries *entries, unsigned int index,
-            unsigned int verdict);
--unsigned int nf_queue_nf_hook_drop(struct net *net);
-+void nf_queue_nf_hook_drop(struct net *net);
- /* nf_log.c */
- int __init netfilter_log_init(void);
---- a/net/netfilter/nf_queue.c
-+++ b/net/netfilter/nf_queue.c
-@@ -96,18 +96,15 @@ void nf_queue_entry_get_refs(struct nf_q
- }
- EXPORT_SYMBOL_GPL(nf_queue_entry_get_refs);
--unsigned int nf_queue_nf_hook_drop(struct net *net)
-+void nf_queue_nf_hook_drop(struct net *net)
- {
-       const struct nf_queue_handler *qh;
--      unsigned int count = 0;
-       rcu_read_lock();
-       qh = rcu_dereference(net->nf.queue_handler);
-       if (qh)
--              count = qh->nf_hook_drop(net);
-+              qh->nf_hook_drop(net);
-       rcu_read_unlock();
--
--      return count;
- }
- EXPORT_SYMBOL_GPL(nf_queue_nf_hook_drop);
---- a/net/netfilter/nfnetlink_queue.c
-+++ b/net/netfilter/nfnetlink_queue.c
-@@ -941,23 +941,18 @@ static struct notifier_block nfqnl_dev_n
-       .notifier_call  = nfqnl_rcv_dev_event,
- };
--static unsigned int nfqnl_nf_hook_drop(struct net *net)
-+static void nfqnl_nf_hook_drop(struct net *net)
- {
-       struct nfnl_queue_net *q = nfnl_queue_pernet(net);
--      unsigned int instances = 0;
-       int i;
-       for (i = 0; i < INSTANCE_BUCKETS; i++) {
-               struct nfqnl_instance *inst;
-               struct hlist_head *head = &q->instance_table[i];
--              hlist_for_each_entry_rcu(inst, head, hlist) {
-+              hlist_for_each_entry_rcu(inst, head, hlist)
-                       nfqnl_flush(inst, NULL, 0);
--                      instances++;
--              }
-       }
--
--      return instances;
- }
- static int
diff --git a/target/linux/generic/backport-4.14/292-v4.16-netfilter-core-free-hooks-with-call_rcu.patch b/target/linux/generic/backport-4.14/292-v4.16-netfilter-core-free-hooks-with-call_rcu.patch
deleted file mode 100644 (file)
index 5eca735..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-From 8c873e2199700c2de7dbd5eedb9d90d5f109462b Mon Sep 17 00:00:00 2001
-From: Florian Westphal <fw@strlen.de>
-Date: Fri, 1 Dec 2017 00:21:04 +0100
-Subject: [PATCH 04/11] netfilter: core: free hooks with call_rcu
-
-Giuseppe Scrivano says:
-  "SELinux, if enabled, registers for each new network namespace 6
-    netfilter hooks."
-
-Cost for this is high.  With synchronize_net() removed:
-   "The net benefit on an SMP machine with two cores is that creating a
-   new network namespace takes -40% of the original time."
-
-This patch replaces synchronize_net+kvfree with call_rcu().
-We store rcu_head at the tail of a structure that has no fixed layout,
-i.e. we cannot use offsetof() to compute the start of the original
-allocation.  Thus store this information right after the rcu head.
-
-We could simplify this by just placing the rcu_head at the start
-of struct nf_hook_entries.  However, this structure is used in
-packet processing hotpath, so only place what is needed for that
-at the beginning of the struct.
-
-Reported-by: Giuseppe Scrivano <gscrivan@redhat.com>
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- include/linux/netfilter.h | 19 +++++++++++++++----
- net/netfilter/core.c      | 34 ++++++++++++++++++++++++++++------
- 2 files changed, 43 insertions(+), 10 deletions(-)
-
---- a/include/linux/netfilter.h
-+++ b/include/linux/netfilter.h
-@@ -77,17 +77,28 @@ struct nf_hook_entry {
-       void                            *priv;
- };
-+struct nf_hook_entries_rcu_head {
-+      struct rcu_head head;
-+      void    *allocation;
-+};
-+
- struct nf_hook_entries {
-       u16                             num_hook_entries;
-       /* padding */
-       struct nf_hook_entry            hooks[];
--      /* trailer: pointers to original orig_ops of each hook.
--       *
--       * This is not part of struct nf_hook_entry since its only
--       * needed in slow path (hook register/unregister).
-+      /* trailer: pointers to original orig_ops of each hook,
-+       * followed by rcu_head and scratch space used for freeing
-+       * the structure via call_rcu.
-        *
-+       *   This is not part of struct nf_hook_entry since its only
-+       *   needed in slow path (hook register/unregister):
-        * const struct nf_hook_ops     *orig_ops[]
-+       *
-+       *   For the same reason, we store this at end -- its
-+       *   only needed when a hook is deleted, not during
-+       *   packet path processing:
-+       * struct nf_hook_entries_rcu_head     head
-        */
- };
---- a/net/netfilter/core.c
-+++ b/net/netfilter/core.c
-@@ -74,7 +74,8 @@ static struct nf_hook_entries *allocate_
-       struct nf_hook_entries *e;
-       size_t alloc = sizeof(*e) +
-                      sizeof(struct nf_hook_entry) * num +
--                     sizeof(struct nf_hook_ops *) * num;
-+                     sizeof(struct nf_hook_ops *) * num +
-+                     sizeof(struct nf_hook_entries_rcu_head);
-       if (num == 0)
-               return NULL;
-@@ -85,6 +86,30 @@ static struct nf_hook_entries *allocate_
-       return e;
- }
-+static void __nf_hook_entries_free(struct rcu_head *h)
-+{
-+      struct nf_hook_entries_rcu_head *head;
-+
-+      head = container_of(h, struct nf_hook_entries_rcu_head, head);
-+      kvfree(head->allocation);
-+}
-+
-+static void nf_hook_entries_free(struct nf_hook_entries *e)
-+{
-+      struct nf_hook_entries_rcu_head *head;
-+      struct nf_hook_ops **ops;
-+      unsigned int num;
-+
-+      if (!e)
-+              return;
-+
-+      num = e->num_hook_entries;
-+      ops = nf_hook_entries_get_hook_ops(e);
-+      head = (void *)&ops[num];
-+      head->allocation = e;
-+      call_rcu(&head->head, __nf_hook_entries_free);
-+}
-+
- static unsigned int accept_all(void *priv,
-                              struct sk_buff *skb,
-                              const struct nf_hook_state *state)
-@@ -291,9 +316,8 @@ int nf_register_net_hook(struct net *net
- #ifdef HAVE_JUMP_LABEL
-       static_key_slow_inc(&nf_hooks_needed[reg->pf][reg->hooknum]);
- #endif
--      synchronize_net();
-       BUG_ON(p == new_hooks);
--      kvfree(p);
-+      nf_hook_entries_free(p);
-       return 0;
- }
- EXPORT_SYMBOL(nf_register_net_hook);
-@@ -361,10 +385,8 @@ void nf_unregister_net_hook(struct net *
-       if (!p)
-               return;
--      synchronize_net();
--
-       nf_queue_nf_hook_drop(net);
--      kvfree(p);
-+      nf_hook_entries_free(p);
- }
- EXPORT_SYMBOL(nf_unregister_net_hook);
diff --git a/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch b/target/linux/generic/backport-4.14/293-v4.16-netfilter-reduce-size-of-hook-entry-point-locations.patch
deleted file mode 100644 (file)
index 4b88912..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-From b0f38338aef2dae5ade3c16acf713737e3b15a73 Mon Sep 17 00:00:00 2001
-From: Florian Westphal <fw@strlen.de>
-Date: Sun, 3 Dec 2017 00:58:47 +0100
-Subject: [PATCH 05/11] netfilter: reduce size of hook entry point locations
-
-struct net contains:
-
-struct nf_hook_entries __rcu *hooks[NFPROTO_NUMPROTO][NF_MAX_HOOKS];
-
-which store the hook entry point locations for the various protocol
-families and the hooks.
-
-Using array results in compact c code when doing accesses, i.e.
-  x = rcu_dereference(net->nf.hooks[pf][hook]);
-
-but its also wasting a lot of memory, as most families are
-not used.
-
-So split the array into those families that are used, which
-are only 5 (instead of 13).  In most cases, the 'pf' argument is
-constant, i.e. gcc removes switch statement.
-
-struct net before:
- /* size: 5184, cachelines: 81, members: 46 */
-after:
- /* size: 4672, cachelines: 73, members: 46 */
-
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- include/linux/netfilter.h       | 24 ++++++++++++++++++++++--
- include/net/netns/netfilter.h   |  6 +++++-
- net/bridge/br_netfilter_hooks.c |  2 +-
- net/netfilter/core.c            | 38 ++++++++++++++++++++++++++++++--------
- net/netfilter/nf_queue.c        | 21 +++++++++++++++++++--
- 5 files changed, 77 insertions(+), 14 deletions(-)
-
---- a/include/linux/netfilter.h
-+++ b/include/linux/netfilter.h
-@@ -195,7 +195,7 @@ static inline int nf_hook(u_int8_t pf, u
-                         struct net_device *indev, struct net_device *outdev,
-                         int (*okfn)(struct net *, struct sock *, struct sk_buff *))
- {
--      struct nf_hook_entries *hook_head;
-+      struct nf_hook_entries *hook_head = NULL;
-       int ret = 1;
- #ifdef HAVE_JUMP_LABEL
-@@ -206,7 +206,27 @@ static inline int nf_hook(u_int8_t pf, u
- #endif
-       rcu_read_lock();
--      hook_head = rcu_dereference(net->nf.hooks[pf][hook]);
-+      switch (pf) {
-+      case NFPROTO_IPV4:
-+              hook_head = rcu_dereference(net->nf.hooks_ipv4[hook]);
-+              break;
-+      case NFPROTO_IPV6:
-+              hook_head = rcu_dereference(net->nf.hooks_ipv6[hook]);
-+              break;
-+      case NFPROTO_ARP:
-+              hook_head = rcu_dereference(net->nf.hooks_arp[hook]);
-+              break;
-+      case NFPROTO_BRIDGE:
-+              hook_head = rcu_dereference(net->nf.hooks_bridge[hook]);
-+              break;
-+      case NFPROTO_DECNET:
-+              hook_head = rcu_dereference(net->nf.hooks_decnet[hook]);
-+              break;
-+      default:
-+              WARN_ON_ONCE(1);
-+              break;
-+      }
-+
-       if (hook_head) {
-               struct nf_hook_state state;
---- a/include/net/netns/netfilter.h
-+++ b/include/net/netns/netfilter.h
-@@ -17,7 +17,11 @@ struct netns_nf {
- #ifdef CONFIG_SYSCTL
-       struct ctl_table_header *nf_log_dir_header;
- #endif
--      struct nf_hook_entries __rcu *hooks[NFPROTO_NUMPROTO][NF_MAX_HOOKS];
-+      struct nf_hook_entries __rcu *hooks_ipv4[NF_MAX_HOOKS];
-+      struct nf_hook_entries __rcu *hooks_ipv6[NF_MAX_HOOKS];
-+      struct nf_hook_entries __rcu *hooks_arp[NF_MAX_HOOKS];
-+      struct nf_hook_entries __rcu *hooks_bridge[NF_MAX_HOOKS];
-+      struct nf_hook_entries __rcu *hooks_decnet[NF_MAX_HOOKS];
- #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV4)
-       bool                    defrag_ipv4;
- #endif
---- a/net/bridge/br_netfilter_hooks.c
-+++ b/net/bridge/br_netfilter_hooks.c
-@@ -991,7 +991,7 @@ int br_nf_hook_thresh(unsigned int hook,
-       unsigned int i;
-       int ret;
--      e = rcu_dereference(net->nf.hooks[NFPROTO_BRIDGE][hook]);
-+      e = rcu_dereference(net->nf.hooks_bridge[hook]);
-       if (!e)
-               return okfn(net, sk, skb);
---- a/net/netfilter/core.c
-+++ b/net/netfilter/core.c
-@@ -264,8 +264,23 @@ out_assign:
- static struct nf_hook_entries __rcu **nf_hook_entry_head(struct net *net, const struct nf_hook_ops *reg)
- {
--      if (reg->pf != NFPROTO_NETDEV)
--              return net->nf.hooks[reg->pf]+reg->hooknum;
-+      switch (reg->pf) {
-+      case NFPROTO_NETDEV:
-+              break;
-+      case NFPROTO_ARP:
-+              return net->nf.hooks_arp + reg->hooknum;
-+      case NFPROTO_BRIDGE:
-+              return net->nf.hooks_bridge + reg->hooknum;
-+      case NFPROTO_IPV4:
-+              return net->nf.hooks_ipv4 + reg->hooknum;
-+      case NFPROTO_IPV6:
-+              return net->nf.hooks_ipv6 + reg->hooknum;
-+      case NFPROTO_DECNET:
-+              return net->nf.hooks_decnet + reg->hooknum;
-+      default:
-+              WARN_ON_ONCE(1);
-+              return NULL;
-+      }
- #ifdef CONFIG_NETFILTER_INGRESS
-       if (reg->hooknum == NF_NETDEV_INGRESS) {
-@@ -534,14 +549,21 @@ void (*nf_nat_decode_session_hook)(struc
- EXPORT_SYMBOL(nf_nat_decode_session_hook);
- #endif
--static int __net_init netfilter_net_init(struct net *net)
-+static void __net_init __netfilter_net_init(struct nf_hook_entries *e[NF_MAX_HOOKS])
- {
--      int i, h;
-+      int h;
--      for (i = 0; i < ARRAY_SIZE(net->nf.hooks); i++) {
--              for (h = 0; h < NF_MAX_HOOKS; h++)
--                      RCU_INIT_POINTER(net->nf.hooks[i][h], NULL);
--      }
-+      for (h = 0; h < NF_MAX_HOOKS; h++)
-+              RCU_INIT_POINTER(e[h], NULL);
-+}
-+
-+static int __net_init netfilter_net_init(struct net *net)
-+{
-+      __netfilter_net_init(net->nf.hooks_ipv4);
-+      __netfilter_net_init(net->nf.hooks_ipv6);
-+      __netfilter_net_init(net->nf.hooks_arp);
-+      __netfilter_net_init(net->nf.hooks_bridge);
-+      __netfilter_net_init(net->nf.hooks_decnet);
- #ifdef CONFIG_PROC_FS
-       net->nf.proc_netfilter = proc_net_mkdir(net, "netfilter",
---- a/net/netfilter/nf_queue.c
-+++ b/net/netfilter/nf_queue.c
-@@ -206,6 +206,23 @@ repeat:
-       return NF_ACCEPT;
- }
-+static struct nf_hook_entries *nf_hook_entries_head(const struct net *net, u8 pf, u8 hooknum)
-+{
-+      switch (pf) {
-+      case NFPROTO_BRIDGE:
-+              return rcu_dereference(net->nf.hooks_bridge[hooknum]);
-+      case NFPROTO_IPV4:
-+              return rcu_dereference(net->nf.hooks_ipv4[hooknum]);
-+      case NFPROTO_IPV6:
-+              return rcu_dereference(net->nf.hooks_ipv6[hooknum]);
-+      default:
-+              WARN_ON_ONCE(1);
-+              return NULL;
-+      }
-+
-+      return NULL;
-+}
-+
- /* Caller must hold rcu read-side lock */
- void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict)
- {
-@@ -221,12 +238,12 @@ void nf_reinject(struct nf_queue_entry *
-       net = entry->state.net;
-       pf = entry->state.pf;
--      hooks = rcu_dereference(net->nf.hooks[pf][entry->state.hook]);
-+      hooks = nf_hook_entries_head(net, pf, entry->state.hook);
-       nf_queue_entry_release_refs(entry);
-       i = entry->hook_index;
--      if (WARN_ON_ONCE(i >= hooks->num_hook_entries)) {
-+      if (WARN_ON_ONCE(!hooks || i >= hooks->num_hook_entries)) {
-               kfree_skb(skb);
-               kfree(entry);
-               return;
diff --git a/target/linux/generic/backport-4.14/294-v4.16-netfilter-reduce-hook-array-sizes-to-what-is-needed.patch b/target/linux/generic/backport-4.14/294-v4.16-netfilter-reduce-hook-array-sizes-to-what-is-needed.patch
deleted file mode 100644 (file)
index d9009b8..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-From ef57170bbfdd6958281011332b1fd237712f69f0 Mon Sep 17 00:00:00 2001
-From: Florian Westphal <fw@strlen.de>
-Date: Thu, 7 Dec 2017 16:28:24 +0100
-Subject: [PATCH 06/11] netfilter: reduce hook array sizes to what is needed
-
-Not all families share the same hook count, adjust sizes to what is
-needed.
-
-struct net before:
-/* size: 6592, cachelines: 103, members: 46 */
-after:
-/* size: 5952, cachelines: 93, members: 46 */
-
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- include/net/netns/netfilter.h | 10 +++++-----
- net/netfilter/core.c          | 24 +++++++++++++++++-------
- 2 files changed, 22 insertions(+), 12 deletions(-)
-
---- a/include/net/netns/netfilter.h
-+++ b/include/net/netns/netfilter.h
-@@ -17,11 +17,11 @@ struct netns_nf {
- #ifdef CONFIG_SYSCTL
-       struct ctl_table_header *nf_log_dir_header;
- #endif
--      struct nf_hook_entries __rcu *hooks_ipv4[NF_MAX_HOOKS];
--      struct nf_hook_entries __rcu *hooks_ipv6[NF_MAX_HOOKS];
--      struct nf_hook_entries __rcu *hooks_arp[NF_MAX_HOOKS];
--      struct nf_hook_entries __rcu *hooks_bridge[NF_MAX_HOOKS];
--      struct nf_hook_entries __rcu *hooks_decnet[NF_MAX_HOOKS];
-+      struct nf_hook_entries __rcu *hooks_ipv4[NF_INET_NUMHOOKS];
-+      struct nf_hook_entries __rcu *hooks_ipv6[NF_INET_NUMHOOKS];
-+      struct nf_hook_entries __rcu *hooks_arp[NF_ARP_NUMHOOKS];
-+      struct nf_hook_entries __rcu *hooks_bridge[NF_INET_NUMHOOKS];
-+      struct nf_hook_entries __rcu *hooks_decnet[NF_DN_NUMHOOKS];
- #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV4)
-       bool                    defrag_ipv4;
- #endif
---- a/net/netfilter/core.c
-+++ b/net/netfilter/core.c
-@@ -268,14 +268,24 @@ static struct nf_hook_entries __rcu **nf
-       case NFPROTO_NETDEV:
-               break;
-       case NFPROTO_ARP:
-+              if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_arp) <= reg->hooknum))
-+                      return NULL;
-               return net->nf.hooks_arp + reg->hooknum;
-       case NFPROTO_BRIDGE:
-+              if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_bridge) <= reg->hooknum))
-+                      return NULL;
-               return net->nf.hooks_bridge + reg->hooknum;
-       case NFPROTO_IPV4:
-+              if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_ipv4) <= reg->hooknum))
-+                      return NULL;
-               return net->nf.hooks_ipv4 + reg->hooknum;
-       case NFPROTO_IPV6:
-+              if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_ipv6) <= reg->hooknum))
-+                      return NULL;
-               return net->nf.hooks_ipv6 + reg->hooknum;
-       case NFPROTO_DECNET:
-+              if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_decnet) <= reg->hooknum))
-+                      return NULL;
-               return net->nf.hooks_decnet + reg->hooknum;
-       default:
-               WARN_ON_ONCE(1);
-@@ -549,21 +559,21 @@ void (*nf_nat_decode_session_hook)(struc
- EXPORT_SYMBOL(nf_nat_decode_session_hook);
- #endif
--static void __net_init __netfilter_net_init(struct nf_hook_entries *e[NF_MAX_HOOKS])
-+static void __net_init __netfilter_net_init(struct nf_hook_entries **e, int max)
- {
-       int h;
--      for (h = 0; h < NF_MAX_HOOKS; h++)
-+      for (h = 0; h < max; h++)
-               RCU_INIT_POINTER(e[h], NULL);
- }
- static int __net_init netfilter_net_init(struct net *net)
- {
--      __netfilter_net_init(net->nf.hooks_ipv4);
--      __netfilter_net_init(net->nf.hooks_ipv6);
--      __netfilter_net_init(net->nf.hooks_arp);
--      __netfilter_net_init(net->nf.hooks_bridge);
--      __netfilter_net_init(net->nf.hooks_decnet);
-+      __netfilter_net_init(net->nf.hooks_ipv4, ARRAY_SIZE(net->nf.hooks_ipv4));
-+      __netfilter_net_init(net->nf.hooks_ipv6, ARRAY_SIZE(net->nf.hooks_ipv6));
-+      __netfilter_net_init(net->nf.hooks_arp, ARRAY_SIZE(net->nf.hooks_arp));
-+      __netfilter_net_init(net->nf.hooks_bridge, ARRAY_SIZE(net->nf.hooks_bridge));
-+      __netfilter_net_init(net->nf.hooks_decnet, ARRAY_SIZE(net->nf.hooks_decnet));
- #ifdef CONFIG_PROC_FS
-       net->nf.proc_netfilter = proc_net_mkdir(net, "netfilter",
diff --git a/target/linux/generic/backport-4.14/295-v4.16-netfilter-don-t-allocate-space-for-decnet-hooks-unle.patch b/target/linux/generic/backport-4.14/295-v4.16-netfilter-don-t-allocate-space-for-decnet-hooks-unle.patch
deleted file mode 100644 (file)
index 26a93c4..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-From bb4badf3a3dc81190f7c1c1fa063cdefb18df45f Mon Sep 17 00:00:00 2001
-From: Florian Westphal <fw@strlen.de>
-Date: Thu, 7 Dec 2017 16:28:25 +0100
-Subject: [PATCH 07/11] netfilter: don't allocate space for decnet hooks unless
- needed
-
-no need to define hook points if the family isn't supported.
-
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- include/linux/netfilter.h     | 2 ++
- include/net/netns/netfilter.h | 2 ++
- net/netfilter/core.c          | 4 ++++
- 3 files changed, 8 insertions(+)
-
---- a/include/linux/netfilter.h
-+++ b/include/linux/netfilter.h
-@@ -219,9 +219,11 @@ static inline int nf_hook(u_int8_t pf, u
-       case NFPROTO_BRIDGE:
-               hook_head = rcu_dereference(net->nf.hooks_bridge[hook]);
-               break;
-+#if IS_ENABLED(CONFIG_DECNET)
-       case NFPROTO_DECNET:
-               hook_head = rcu_dereference(net->nf.hooks_decnet[hook]);
-               break;
-+#endif
-       default:
-               WARN_ON_ONCE(1);
-               break;
---- a/include/net/netns/netfilter.h
-+++ b/include/net/netns/netfilter.h
-@@ -21,7 +21,9 @@ struct netns_nf {
-       struct nf_hook_entries __rcu *hooks_ipv6[NF_INET_NUMHOOKS];
-       struct nf_hook_entries __rcu *hooks_arp[NF_ARP_NUMHOOKS];
-       struct nf_hook_entries __rcu *hooks_bridge[NF_INET_NUMHOOKS];
-+#if IS_ENABLED(CONFIG_DECNET)
-       struct nf_hook_entries __rcu *hooks_decnet[NF_DN_NUMHOOKS];
-+#endif
- #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV4)
-       bool                    defrag_ipv4;
- #endif
---- a/net/netfilter/core.c
-+++ b/net/netfilter/core.c
-@@ -283,10 +283,12 @@ static struct nf_hook_entries __rcu **nf
-               if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_ipv6) <= reg->hooknum))
-                       return NULL;
-               return net->nf.hooks_ipv6 + reg->hooknum;
-+#if IS_ENABLED(CONFIG_DECNET)
-       case NFPROTO_DECNET:
-               if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_decnet) <= reg->hooknum))
-                       return NULL;
-               return net->nf.hooks_decnet + reg->hooknum;
-+#endif
-       default:
-               WARN_ON_ONCE(1);
-               return NULL;
-@@ -573,7 +575,9 @@ static int __net_init netfilter_net_init
-       __netfilter_net_init(net->nf.hooks_ipv6, ARRAY_SIZE(net->nf.hooks_ipv6));
-       __netfilter_net_init(net->nf.hooks_arp, ARRAY_SIZE(net->nf.hooks_arp));
-       __netfilter_net_init(net->nf.hooks_bridge, ARRAY_SIZE(net->nf.hooks_bridge));
-+#if IS_ENABLED(CONFIG_DECNET)
-       __netfilter_net_init(net->nf.hooks_decnet, ARRAY_SIZE(net->nf.hooks_decnet));
-+#endif
- #ifdef CONFIG_PROC_FS
-       net->nf.proc_netfilter = proc_net_mkdir(net, "netfilter",
diff --git a/target/linux/generic/backport-4.14/296-v4.16-netfilter-don-t-allocate-space-for-arp-bridge-hooks-.patch b/target/linux/generic/backport-4.14/296-v4.16-netfilter-don-t-allocate-space-for-arp-bridge-hooks-.patch
deleted file mode 100644 (file)
index 41675c3..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-From 2a95183a5e0375df756efb2ca37602d71e8455f9 Mon Sep 17 00:00:00 2001
-From: Florian Westphal <fw@strlen.de>
-Date: Thu, 7 Dec 2017 16:28:26 +0100
-Subject: [PATCH 08/11] netfilter: don't allocate space for arp/bridge hooks
- unless needed
-
-no need to define hook points if the family isn't supported.
-Because we need these hooks for either nftables, arp/ebtables
-or the 'call-iptables' hack we have in the bridge layer add two
-new dependencies, NETFILTER_FAMILY_{ARP,BRIDGE}, and have the
-users select them.
-
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- include/linux/netfilter.h     | 4 ++++
- include/net/netns/netfilter.h | 4 ++++
- net/Kconfig                   | 1 +
- net/bridge/netfilter/Kconfig  | 2 ++
- net/ipv4/netfilter/Kconfig    | 2 ++
- net/netfilter/Kconfig         | 6 ++++++
- net/netfilter/core.c          | 8 ++++++++
- net/netfilter/nf_queue.c      | 2 ++
- 8 files changed, 29 insertions(+)
-
---- a/include/linux/netfilter.h
-+++ b/include/linux/netfilter.h
-@@ -214,10 +214,14 @@ static inline int nf_hook(u_int8_t pf, u
-               hook_head = rcu_dereference(net->nf.hooks_ipv6[hook]);
-               break;
-       case NFPROTO_ARP:
-+#ifdef CONFIG_NETFILTER_FAMILY_ARP
-               hook_head = rcu_dereference(net->nf.hooks_arp[hook]);
-+#endif
-               break;
-       case NFPROTO_BRIDGE:
-+#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE
-               hook_head = rcu_dereference(net->nf.hooks_bridge[hook]);
-+#endif
-               break;
- #if IS_ENABLED(CONFIG_DECNET)
-       case NFPROTO_DECNET:
---- a/include/net/netns/netfilter.h
-+++ b/include/net/netns/netfilter.h
-@@ -19,8 +19,12 @@ struct netns_nf {
- #endif
-       struct nf_hook_entries __rcu *hooks_ipv4[NF_INET_NUMHOOKS];
-       struct nf_hook_entries __rcu *hooks_ipv6[NF_INET_NUMHOOKS];
-+#ifdef CONFIG_NETFILTER_FAMILY_ARP
-       struct nf_hook_entries __rcu *hooks_arp[NF_ARP_NUMHOOKS];
-+#endif
-+#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE
-       struct nf_hook_entries __rcu *hooks_bridge[NF_INET_NUMHOOKS];
-+#endif
- #if IS_ENABLED(CONFIG_DECNET)
-       struct nf_hook_entries __rcu *hooks_decnet[NF_DN_NUMHOOKS];
- #endif
---- a/net/Kconfig
-+++ b/net/Kconfig
-@@ -182,6 +182,7 @@ config BRIDGE_NETFILTER
-       depends on BRIDGE
-       depends on NETFILTER && INET
-       depends on NETFILTER_ADVANCED
-+      select NETFILTER_FAMILY_BRIDGE
-       default m
-       ---help---
-         Enabling this option will let arptables resp. iptables see bridged
---- a/net/bridge/netfilter/Kconfig
-+++ b/net/bridge/netfilter/Kconfig
-@@ -4,6 +4,7 @@
- #
- menuconfig NF_TABLES_BRIDGE
-       depends on BRIDGE && NETFILTER && NF_TABLES
-+      select NETFILTER_FAMILY_BRIDGE
-       tristate "Ethernet Bridge nf_tables support"
- if NF_TABLES_BRIDGE
-@@ -29,6 +30,7 @@ endif # NF_TABLES_BRIDGE
- menuconfig BRIDGE_NF_EBTABLES
-       tristate "Ethernet Bridge tables (ebtables) support"
-       depends on BRIDGE && NETFILTER && NETFILTER_XTABLES
-+      select NETFILTER_FAMILY_BRIDGE
-       help
-         ebtables is a general, extensible frame/packet identification
-         framework. Say 'Y' or 'M' here if you want to do Ethernet
---- a/net/ipv4/netfilter/Kconfig
-+++ b/net/ipv4/netfilter/Kconfig
-@@ -72,6 +72,7 @@ endif # NF_TABLES_IPV4
- config NF_TABLES_ARP
-       tristate "ARP nf_tables support"
-+      select NETFILTER_FAMILY_ARP
-       help
-         This option enables the ARP support for nf_tables.
-@@ -392,6 +393,7 @@ endif # IP_NF_IPTABLES
- config IP_NF_ARPTABLES
-       tristate "ARP tables support"
-       select NETFILTER_XTABLES
-+      select NETFILTER_FAMILY_ARP
-       depends on NETFILTER_ADVANCED
-       help
-         arptables is a general, extensible packet identification framework.
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -12,6 +12,12 @@ config NETFILTER_INGRESS
- config NETFILTER_NETLINK
-       tristate
-+config NETFILTER_FAMILY_BRIDGE
-+      bool
-+
-+config NETFILTER_FAMILY_ARP
-+      bool
-+
- config NETFILTER_NETLINK_ACCT
- tristate "Netfilter NFACCT over NFNETLINK interface"
-       depends on NETFILTER_ADVANCED
---- a/net/netfilter/core.c
-+++ b/net/netfilter/core.c
-@@ -267,14 +267,18 @@ static struct nf_hook_entries __rcu **nf
-       switch (reg->pf) {
-       case NFPROTO_NETDEV:
-               break;
-+#ifdef CONFIG_NETFILTER_FAMILY_ARP
-       case NFPROTO_ARP:
-               if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_arp) <= reg->hooknum))
-                       return NULL;
-               return net->nf.hooks_arp + reg->hooknum;
-+#endif
-+#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE
-       case NFPROTO_BRIDGE:
-               if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_bridge) <= reg->hooknum))
-                       return NULL;
-               return net->nf.hooks_bridge + reg->hooknum;
-+#endif
-       case NFPROTO_IPV4:
-               if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_ipv4) <= reg->hooknum))
-                       return NULL;
-@@ -573,8 +577,12 @@ static int __net_init netfilter_net_init
- {
-       __netfilter_net_init(net->nf.hooks_ipv4, ARRAY_SIZE(net->nf.hooks_ipv4));
-       __netfilter_net_init(net->nf.hooks_ipv6, ARRAY_SIZE(net->nf.hooks_ipv6));
-+#ifdef CONFIG_NETFILTER_FAMILY_ARP
-       __netfilter_net_init(net->nf.hooks_arp, ARRAY_SIZE(net->nf.hooks_arp));
-+#endif
-+#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE
-       __netfilter_net_init(net->nf.hooks_bridge, ARRAY_SIZE(net->nf.hooks_bridge));
-+#endif
- #if IS_ENABLED(CONFIG_DECNET)
-       __netfilter_net_init(net->nf.hooks_decnet, ARRAY_SIZE(net->nf.hooks_decnet));
- #endif
---- a/net/netfilter/nf_queue.c
-+++ b/net/netfilter/nf_queue.c
-@@ -209,8 +209,10 @@ repeat:
- static struct nf_hook_entries *nf_hook_entries_head(const struct net *net, u8 pf, u8 hooknum)
- {
-       switch (pf) {
-+#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE
-       case NFPROTO_BRIDGE:
-               return rcu_dereference(net->nf.hooks_bridge[hooknum]);
-+#endif
-       case NFPROTO_IPV4:
-               return rcu_dereference(net->nf.hooks_ipv4[hooknum]);
-       case NFPROTO_IPV6:
diff --git a/target/linux/generic/backport-4.14/297-v4.16-netfilter-core-pass-hook-number-family-and-device-to.patch b/target/linux/generic/backport-4.14/297-v4.16-netfilter-core-pass-hook-number-family-and-device-to.patch
deleted file mode 100644 (file)
index 7d450f9..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-From 62a0fe46e2aaba1812d3cbcae014a41539f9eb09 Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Sat, 9 Dec 2017 15:23:51 +0100
-Subject: [PATCH 09/11] netfilter: core: pass hook number, family and device to
- nf_find_hook_list()
-
-Instead of passing struct nf_hook_ops, this is needed by follow up
-patches to handle NFPROTO_INET from the core.
-
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- net/netfilter/core.c | 36 +++++++++++++++++++-----------------
- 1 file changed, 19 insertions(+), 17 deletions(-)
-
---- a/net/netfilter/core.c
-+++ b/net/netfilter/core.c
-@@ -262,36 +262,38 @@ out_assign:
-       return old;
- }
--static struct nf_hook_entries __rcu **nf_hook_entry_head(struct net *net, const struct nf_hook_ops *reg)
-+static struct nf_hook_entries __rcu **
-+nf_hook_entry_head(struct net *net, int pf, unsigned int hooknum,
-+                 struct net_device *dev)
- {
--      switch (reg->pf) {
-+      switch (pf) {
-       case NFPROTO_NETDEV:
-               break;
- #ifdef CONFIG_NETFILTER_FAMILY_ARP
-       case NFPROTO_ARP:
--              if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_arp) <= reg->hooknum))
-+              if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_arp) <= hooknum))
-                       return NULL;
--              return net->nf.hooks_arp + reg->hooknum;
-+              return net->nf.hooks_arp + hooknum;
- #endif
- #ifdef CONFIG_NETFILTER_FAMILY_BRIDGE
-       case NFPROTO_BRIDGE:
--              if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_bridge) <= reg->hooknum))
-+              if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_bridge) <= hooknum))
-                       return NULL;
--              return net->nf.hooks_bridge + reg->hooknum;
-+              return net->nf.hooks_bridge + hooknum;
- #endif
-       case NFPROTO_IPV4:
--              if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_ipv4) <= reg->hooknum))
-+              if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_ipv4) <= hooknum))
-                       return NULL;
--              return net->nf.hooks_ipv4 + reg->hooknum;
-+              return net->nf.hooks_ipv4 + hooknum;
-       case NFPROTO_IPV6:
--              if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_ipv6) <= reg->hooknum))
-+              if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_ipv6) <= hooknum))
-                       return NULL;
--              return net->nf.hooks_ipv6 + reg->hooknum;
-+              return net->nf.hooks_ipv6 + hooknum;
- #if IS_ENABLED(CONFIG_DECNET)
-       case NFPROTO_DECNET:
--              if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_decnet) <= reg->hooknum))
-+              if (WARN_ON_ONCE(ARRAY_SIZE(net->nf.hooks_decnet) <= hooknum))
-                       return NULL;
--              return net->nf.hooks_decnet + reg->hooknum;
-+              return net->nf.hooks_decnet + hooknum;
- #endif
-       default:
-               WARN_ON_ONCE(1);
-@@ -299,9 +301,9 @@ static struct nf_hook_entries __rcu **nf
-       }
- #ifdef CONFIG_NETFILTER_INGRESS
--      if (reg->hooknum == NF_NETDEV_INGRESS) {
--              if (reg->dev && dev_net(reg->dev) == net)
--                      return &reg->dev->nf_hooks_ingress;
-+      if (hooknum == NF_NETDEV_INGRESS) {
-+              if (dev && dev_net(dev) == net)
-+                      return &dev->nf_hooks_ingress;
-       }
- #endif
-       WARN_ON_ONCE(1);
-@@ -323,7 +325,7 @@ int nf_register_net_hook(struct net *net
-                       return -EINVAL;
-       }
--      pp = nf_hook_entry_head(net, reg);
-+      pp = nf_hook_entry_head(net, reg->pf, reg->hooknum, reg->dev);
-       if (!pp)
-               return -EINVAL;
-@@ -397,7 +399,7 @@ void nf_unregister_net_hook(struct net *
-       struct nf_hook_entries __rcu **pp;
-       struct nf_hook_entries *p;
--      pp = nf_hook_entry_head(net, reg);
-+      pp = nf_hook_entry_head(net, reg->pf, reg->hooknum, reg->dev);
-       if (!pp)
-               return;
diff --git a/target/linux/generic/backport-4.14/298-v4.16-netfilter-core-add-nf_remove_net_hook.patch b/target/linux/generic/backport-4.14/298-v4.16-netfilter-core-add-nf_remove_net_hook.patch
deleted file mode 100644 (file)
index 8fea44b..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3d3cdc38e8c265a9f9d3825e823e772872bca1b8 Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Sat, 9 Dec 2017 15:19:14 +0100
-Subject: [PATCH 01/11] netfilter: core: add nf_remove_net_hook
-
-Just a cleanup, __nf_unregister_net_hook() is used by a follow up patch
-when handling NFPROTO_INET as a real family from the core.
-
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- net/netfilter/core.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
---- a/net/netfilter/core.c
-+++ b/net/netfilter/core.c
-@@ -356,7 +356,7 @@ int nf_register_net_hook(struct net *net
- EXPORT_SYMBOL(nf_register_net_hook);
- /*
-- * __nf_unregister_net_hook - remove a hook from blob
-+ * nf_remove_net_hook - remove a hook from blob
-  *
-  * @oldp: current address of hook blob
-  * @unreg: hook to unregister
-@@ -364,8 +364,8 @@ EXPORT_SYMBOL(nf_register_net_hook);
-  * This cannot fail, hook unregistration must always succeed.
-  * Therefore replace the to-be-removed hook with a dummy hook.
-  */
--static void __nf_unregister_net_hook(struct nf_hook_entries *old,
--                                   const struct nf_hook_ops *unreg)
-+static void nf_remove_net_hook(struct nf_hook_entries *old,
-+                             const struct nf_hook_ops *unreg)
- {
-       struct nf_hook_ops **orig_ops;
-       bool found = false;
-@@ -411,7 +411,7 @@ void nf_unregister_net_hook(struct net *
-               return;
-       }
--      __nf_unregister_net_hook(p, reg);
-+      nf_remove_net_hook(p, reg);
-       p = __nf_hook_entries_try_shrink(pp);
-       mutex_unlock(&nf_hook_mutex);
diff --git a/target/linux/generic/backport-4.14/298-v4.16-netfilter-core-pass-family-as-parameter-to-nf_remove.patch b/target/linux/generic/backport-4.14/298-v4.16-netfilter-core-pass-family-as-parameter-to-nf_remove.patch
deleted file mode 100644 (file)
index 4c52635..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From 30259408118f550f5969fda19c0d67020d21eda8 Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Sat, 9 Dec 2017 15:26:37 +0100
-Subject: [PATCH 10/11] netfilter: core: pass family as parameter to
- nf_remove_net_hook()
-
-So static_key_slow_dec applies to the family behind NFPROTO_INET.
-
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- net/netfilter/core.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/net/netfilter/core.c
-+++ b/net/netfilter/core.c
-@@ -365,7 +365,7 @@ EXPORT_SYMBOL(nf_register_net_hook);
-  * Therefore replace the to-be-removed hook with a dummy hook.
-  */
- static void nf_remove_net_hook(struct nf_hook_entries *old,
--                             const struct nf_hook_ops *unreg)
-+                             const struct nf_hook_ops *unreg, int pf)
- {
-       struct nf_hook_ops **orig_ops;
-       bool found = false;
-@@ -383,14 +383,14 @@ static void nf_remove_net_hook(struct nf
-       if (found) {
- #ifdef CONFIG_NETFILTER_INGRESS
--              if (unreg->pf == NFPROTO_NETDEV && unreg->hooknum == NF_NETDEV_INGRESS)
-+              if (pf == NFPROTO_NETDEV && unreg->hooknum == NF_NETDEV_INGRESS)
-                       net_dec_ingress_queue();
- #endif
- #ifdef HAVE_JUMP_LABEL
--              static_key_slow_dec(&nf_hooks_needed[unreg->pf][unreg->hooknum]);
-+              static_key_slow_dec(&nf_hooks_needed[pf][unreg->hooknum]);
- #endif
-       } else {
--              WARN_ONCE(1, "hook not found, pf %d num %d", unreg->pf, unreg->hooknum);
-+              WARN_ONCE(1, "hook not found, pf %d num %d", pf, unreg->hooknum);
-       }
- }
-@@ -411,7 +411,7 @@ void nf_unregister_net_hook(struct net *
-               return;
-       }
--      nf_remove_net_hook(p, reg);
-+      nf_remove_net_hook(p, reg, reg->pf);
-       p = __nf_hook_entries_try_shrink(pp);
-       mutex_unlock(&nf_hook_mutex);
diff --git a/target/linux/generic/backport-4.14/299-v4.16-netfilter-core-support-for-NFPROTO_INET-hook-registr.patch b/target/linux/generic/backport-4.14/299-v4.16-netfilter-core-support-for-NFPROTO_INET-hook-registr.patch
deleted file mode 100644 (file)
index b112855..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-From cb7ccd835ebb333669e400f99c650e4f3abf11c0 Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Sat, 9 Dec 2017 15:30:26 +0100
-Subject: [PATCH 11/11] netfilter: core: support for NFPROTO_INET hook
- registration
-
-Expand NFPROTO_INET in two hook registrations, one for NFPROTO_IPV4 and
-another for NFPROTO_IPV6. Hence, we handle NFPROTO_INET from the core.
-
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- net/netfilter/core.c | 53 +++++++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 44 insertions(+), 9 deletions(-)
-
---- a/net/netfilter/core.c
-+++ b/net/netfilter/core.c
-@@ -310,12 +310,13 @@ nf_hook_entry_head(struct net *net, int
-       return NULL;
- }
--int nf_register_net_hook(struct net *net, const struct nf_hook_ops *reg)
-+static int __nf_register_net_hook(struct net *net, int pf,
-+                                const struct nf_hook_ops *reg)
- {
-       struct nf_hook_entries *p, *new_hooks;
-       struct nf_hook_entries __rcu **pp;
--      if (reg->pf == NFPROTO_NETDEV) {
-+      if (pf == NFPROTO_NETDEV) {
- #ifndef CONFIG_NETFILTER_INGRESS
-               if (reg->hooknum == NF_NETDEV_INGRESS)
-                       return -EOPNOTSUPP;
-@@ -325,7 +326,7 @@ int nf_register_net_hook(struct net *net
-                       return -EINVAL;
-       }
--      pp = nf_hook_entry_head(net, reg->pf, reg->hooknum, reg->dev);
-+      pp = nf_hook_entry_head(net, pf, reg->hooknum, reg->dev);
-       if (!pp)
-               return -EINVAL;
-@@ -343,17 +344,16 @@ int nf_register_net_hook(struct net *net
-       hooks_validate(new_hooks);
- #ifdef CONFIG_NETFILTER_INGRESS
--      if (reg->pf == NFPROTO_NETDEV && reg->hooknum == NF_NETDEV_INGRESS)
-+      if (pf == NFPROTO_NETDEV && reg->hooknum == NF_NETDEV_INGRESS)
-               net_inc_ingress_queue();
- #endif
- #ifdef HAVE_JUMP_LABEL
--      static_key_slow_inc(&nf_hooks_needed[reg->pf][reg->hooknum]);
-+      static_key_slow_inc(&nf_hooks_needed[pf][reg->hooknum]);
- #endif
-       BUG_ON(p == new_hooks);
-       nf_hook_entries_free(p);
-       return 0;
- }
--EXPORT_SYMBOL(nf_register_net_hook);
- /*
-  * nf_remove_net_hook - remove a hook from blob
-@@ -394,12 +394,13 @@ static void nf_remove_net_hook(struct nf
-       }
- }
--void nf_unregister_net_hook(struct net *net, const struct nf_hook_ops *reg)
-+void __nf_unregister_net_hook(struct net *net, int pf,
-+                            const struct nf_hook_ops *reg)
- {
-       struct nf_hook_entries __rcu **pp;
-       struct nf_hook_entries *p;
--      pp = nf_hook_entry_head(net, reg->pf, reg->hooknum, reg->dev);
-+      pp = nf_hook_entry_head(net, pf, reg->hooknum, reg->dev);
-       if (!pp)
-               return;
-@@ -411,7 +412,7 @@ void nf_unregister_net_hook(struct net *
-               return;
-       }
--      nf_remove_net_hook(p, reg, reg->pf);
-+      nf_remove_net_hook(p, reg, pf);
-       p = __nf_hook_entries_try_shrink(pp);
-       mutex_unlock(&nf_hook_mutex);
-@@ -421,8 +422,42 @@ void nf_unregister_net_hook(struct net *
-       nf_queue_nf_hook_drop(net);
-       nf_hook_entries_free(p);
- }
-+
-+void nf_unregister_net_hook(struct net *net, const struct nf_hook_ops *reg)
-+{
-+      if (reg->pf == NFPROTO_INET) {
-+              __nf_unregister_net_hook(net, NFPROTO_IPV4, reg);
-+              __nf_unregister_net_hook(net, NFPROTO_IPV6, reg);
-+      } else {
-+              __nf_unregister_net_hook(net, reg->pf, reg);
-+      }
-+}
- EXPORT_SYMBOL(nf_unregister_net_hook);
-+int nf_register_net_hook(struct net *net, const struct nf_hook_ops *reg)
-+{
-+      int err;
-+
-+      if (reg->pf == NFPROTO_INET) {
-+              err = __nf_register_net_hook(net, NFPROTO_IPV4, reg);
-+              if (err < 0)
-+                      return err;
-+
-+              err = __nf_register_net_hook(net, NFPROTO_IPV6, reg);
-+              if (err < 0) {
-+                      __nf_unregister_net_hook(net, NFPROTO_IPV4, reg);
-+                      return err;
-+              }
-+      } else {
-+              err = __nf_register_net_hook(net, reg->pf, reg);
-+              if (err < 0)
-+                      return err;
-+      }
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL(nf_register_net_hook);
-+
- int nf_register_net_hooks(struct net *net, const struct nf_hook_ops *reg,
-                         unsigned int n)
- {
diff --git a/target/linux/generic/backport-4.14/300-v4.16-netfilter-nf_tables-explicit-nft_set_pktinfo-call-fr.patch b/target/linux/generic/backport-4.14/300-v4.16-netfilter-nf_tables-explicit-nft_set_pktinfo-call-fr.patch
deleted file mode 100644 (file)
index c0cb5bb..0000000
+++ /dev/null
@@ -1,291 +0,0 @@
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Sun, 10 Dec 2017 01:43:14 +0100
-Subject: [PATCH] netfilter: nf_tables: explicit nft_set_pktinfo() call from
- hook path
-
-Instead of calling this function from the family specific variant, this
-reduces the code size in the fast path for the netdev, bridge and inet
-families. After this change, we must call nft_set_pktinfo() upfront from
-the chain hook indirection.
-
-Before:
-
-   text    data     bss     dec     hex filename
-   2145     208       0    2353     931 net/netfilter/nf_tables_netdev.o
-
-After:
-
-   text    data     bss     dec     hex filename
-   2125     208       0    2333     91d net/netfilter/nf_tables_netdev.o
-
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
-
---- a/include/net/netfilter/nf_tables.h
-+++ b/include/net/netfilter/nf_tables.h
-@@ -54,8 +54,8 @@ static inline void nft_set_pktinfo(struc
-       pkt->xt.state = state;
- }
--static inline void nft_set_pktinfo_proto_unspec(struct nft_pktinfo *pkt,
--                                              struct sk_buff *skb)
-+static inline void nft_set_pktinfo_unspec(struct nft_pktinfo *pkt,
-+                                        struct sk_buff *skb)
- {
-       pkt->tprot_set = false;
-       pkt->tprot = 0;
-@@ -63,14 +63,6 @@ static inline void nft_set_pktinfo_proto
-       pkt->xt.fragoff = 0;
- }
--static inline void nft_set_pktinfo_unspec(struct nft_pktinfo *pkt,
--                                        struct sk_buff *skb,
--                                        const struct nf_hook_state *state)
--{
--      nft_set_pktinfo(pkt, skb, state);
--      nft_set_pktinfo_proto_unspec(pkt, skb);
--}
--
- /**
-  *    struct nft_verdict - nf_tables verdict
-  *
---- a/include/net/netfilter/nf_tables_ipv4.h
-+++ b/include/net/netfilter/nf_tables_ipv4.h
-@@ -5,15 +5,11 @@
- #include <net/netfilter/nf_tables.h>
- #include <net/ip.h>
--static inline void
--nft_set_pktinfo_ipv4(struct nft_pktinfo *pkt,
--                   struct sk_buff *skb,
--                   const struct nf_hook_state *state)
-+static inline void nft_set_pktinfo_ipv4(struct nft_pktinfo *pkt,
-+                                      struct sk_buff *skb)
- {
-       struct iphdr *ip;
--      nft_set_pktinfo(pkt, skb, state);
--
-       ip = ip_hdr(pkt->skb);
-       pkt->tprot_set = true;
-       pkt->tprot = ip->protocol;
-@@ -21,10 +17,8 @@ nft_set_pktinfo_ipv4(struct nft_pktinfo
-       pkt->xt.fragoff = ntohs(ip->frag_off) & IP_OFFSET;
- }
--static inline int
--__nft_set_pktinfo_ipv4_validate(struct nft_pktinfo *pkt,
--                              struct sk_buff *skb,
--                              const struct nf_hook_state *state)
-+static inline int __nft_set_pktinfo_ipv4_validate(struct nft_pktinfo *pkt,
-+                                                struct sk_buff *skb)
- {
-       struct iphdr *iph, _iph;
-       u32 len, thoff;
-@@ -52,14 +46,11 @@ __nft_set_pktinfo_ipv4_validate(struct n
-       return 0;
- }
--static inline void
--nft_set_pktinfo_ipv4_validate(struct nft_pktinfo *pkt,
--                            struct sk_buff *skb,
--                            const struct nf_hook_state *state)
-+static inline void nft_set_pktinfo_ipv4_validate(struct nft_pktinfo *pkt,
-+                                               struct sk_buff *skb)
- {
--      nft_set_pktinfo(pkt, skb, state);
--      if (__nft_set_pktinfo_ipv4_validate(pkt, skb, state) < 0)
--              nft_set_pktinfo_proto_unspec(pkt, skb);
-+      if (__nft_set_pktinfo_ipv4_validate(pkt, skb) < 0)
-+              nft_set_pktinfo_unspec(pkt, skb);
- }
- extern struct nft_af_info nft_af_ipv4;
---- a/include/net/netfilter/nf_tables_ipv6.h
-+++ b/include/net/netfilter/nf_tables_ipv6.h
-@@ -5,20 +5,16 @@
- #include <linux/netfilter_ipv6/ip6_tables.h>
- #include <net/ipv6.h>
--static inline void
--nft_set_pktinfo_ipv6(struct nft_pktinfo *pkt,
--                   struct sk_buff *skb,
--                   const struct nf_hook_state *state)
-+static inline void nft_set_pktinfo_ipv6(struct nft_pktinfo *pkt,
-+                                      struct sk_buff *skb)
- {
-       unsigned int flags = IP6_FH_F_AUTH;
-       int protohdr, thoff = 0;
-       unsigned short frag_off;
--      nft_set_pktinfo(pkt, skb, state);
--
-       protohdr = ipv6_find_hdr(pkt->skb, &thoff, -1, &frag_off, &flags);
-       if (protohdr < 0) {
--              nft_set_pktinfo_proto_unspec(pkt, skb);
-+              nft_set_pktinfo_unspec(pkt, skb);
-               return;
-       }
-@@ -28,10 +24,8 @@ nft_set_pktinfo_ipv6(struct nft_pktinfo
-       pkt->xt.fragoff = frag_off;
- }
--static inline int
--__nft_set_pktinfo_ipv6_validate(struct nft_pktinfo *pkt,
--                              struct sk_buff *skb,
--                              const struct nf_hook_state *state)
-+static inline int __nft_set_pktinfo_ipv6_validate(struct nft_pktinfo *pkt,
-+                                                struct sk_buff *skb)
- {
- #if IS_ENABLED(CONFIG_IPV6)
-       unsigned int flags = IP6_FH_F_AUTH;
-@@ -68,14 +62,11 @@ __nft_set_pktinfo_ipv6_validate(struct n
- #endif
- }
--static inline void
--nft_set_pktinfo_ipv6_validate(struct nft_pktinfo *pkt,
--                            struct sk_buff *skb,
--                            const struct nf_hook_state *state)
-+static inline void nft_set_pktinfo_ipv6_validate(struct nft_pktinfo *pkt,
-+                                               struct sk_buff *skb)
- {
--      nft_set_pktinfo(pkt, skb, state);
--      if (__nft_set_pktinfo_ipv6_validate(pkt, skb, state) < 0)
--              nft_set_pktinfo_proto_unspec(pkt, skb);
-+      if (__nft_set_pktinfo_ipv6_validate(pkt, skb) < 0)
-+              nft_set_pktinfo_unspec(pkt, skb);
- }
- extern struct nft_af_info nft_af_ipv6;
---- a/net/bridge/netfilter/nf_tables_bridge.c
-+++ b/net/bridge/netfilter/nf_tables_bridge.c
-@@ -25,15 +25,17 @@ nft_do_chain_bridge(void *priv,
- {
-       struct nft_pktinfo pkt;
-+      nft_set_pktinfo(&pkt, skb, state);
-+
-       switch (eth_hdr(skb)->h_proto) {
-       case htons(ETH_P_IP):
--              nft_set_pktinfo_ipv4_validate(&pkt, skb, state);
-+              nft_set_pktinfo_ipv4_validate(&pkt, skb);
-               break;
-       case htons(ETH_P_IPV6):
--              nft_set_pktinfo_ipv6_validate(&pkt, skb, state);
-+              nft_set_pktinfo_ipv6_validate(&pkt, skb);
-               break;
-       default:
--              nft_set_pktinfo_unspec(&pkt, skb, state);
-+              nft_set_pktinfo_unspec(&pkt, skb);
-               break;
-       }
---- a/net/ipv4/netfilter/nf_tables_arp.c
-+++ b/net/ipv4/netfilter/nf_tables_arp.c
-@@ -21,7 +21,8 @@ nft_do_chain_arp(void *priv,
- {
-       struct nft_pktinfo pkt;
--      nft_set_pktinfo_unspec(&pkt, skb, state);
-+      nft_set_pktinfo(&pkt, skb, state);
-+      nft_set_pktinfo_unspec(&pkt, skb);
-       return nft_do_chain(&pkt, priv);
- }
---- a/net/ipv4/netfilter/nf_tables_ipv4.c
-+++ b/net/ipv4/netfilter/nf_tables_ipv4.c
-@@ -24,7 +24,8 @@ static unsigned int nft_do_chain_ipv4(vo
- {
-       struct nft_pktinfo pkt;
--      nft_set_pktinfo_ipv4(&pkt, skb, state);
-+      nft_set_pktinfo(&pkt, skb, state);
-+      nft_set_pktinfo_ipv4(&pkt, skb);
-       return nft_do_chain(&pkt, priv);
- }
---- a/net/ipv4/netfilter/nft_chain_nat_ipv4.c
-+++ b/net/ipv4/netfilter/nft_chain_nat_ipv4.c
-@@ -33,7 +33,8 @@ static unsigned int nft_nat_do_chain(voi
- {
-       struct nft_pktinfo pkt;
--      nft_set_pktinfo_ipv4(&pkt, skb, state);
-+      nft_set_pktinfo(&pkt, skb, state);
-+      nft_set_pktinfo_ipv4(&pkt, skb);
-       return nft_do_chain(&pkt, priv);
- }
---- a/net/ipv4/netfilter/nft_chain_route_ipv4.c
-+++ b/net/ipv4/netfilter/nft_chain_route_ipv4.c
-@@ -38,7 +38,8 @@ static unsigned int nf_route_table_hook(
-           ip_hdrlen(skb) < sizeof(struct iphdr))
-               return NF_ACCEPT;
--      nft_set_pktinfo_ipv4(&pkt, skb, state);
-+      nft_set_pktinfo(&pkt, skb, state);
-+      nft_set_pktinfo_ipv4(&pkt, skb);
-       mark = skb->mark;
-       iph = ip_hdr(skb);
---- a/net/ipv6/netfilter/nf_tables_ipv6.c
-+++ b/net/ipv6/netfilter/nf_tables_ipv6.c
-@@ -22,7 +22,8 @@ static unsigned int nft_do_chain_ipv6(vo
- {
-       struct nft_pktinfo pkt;
--      nft_set_pktinfo_ipv6(&pkt, skb, state);
-+      nft_set_pktinfo(&pkt, skb, state);
-+      nft_set_pktinfo_ipv6(&pkt, skb);
-       return nft_do_chain(&pkt, priv);
- }
---- a/net/ipv6/netfilter/nft_chain_nat_ipv6.c
-+++ b/net/ipv6/netfilter/nft_chain_nat_ipv6.c
-@@ -31,7 +31,8 @@ static unsigned int nft_nat_do_chain(voi
- {
-       struct nft_pktinfo pkt;
--      nft_set_pktinfo_ipv6(&pkt, skb, state);
-+      nft_set_pktinfo(&pkt, skb, state);
-+      nft_set_pktinfo_ipv6(&pkt, skb);
-       return nft_do_chain(&pkt, priv);
- }
---- a/net/ipv6/netfilter/nft_chain_route_ipv6.c
-+++ b/net/ipv6/netfilter/nft_chain_route_ipv6.c
-@@ -33,7 +33,8 @@ static unsigned int nf_route_table_hook(
-       u32 mark, flowlabel;
-       int err;
--      nft_set_pktinfo_ipv6(&pkt, skb, state);
-+      nft_set_pktinfo(&pkt, skb, state);
-+      nft_set_pktinfo_ipv6(&pkt, skb);
-       /* save source/dest address, mark, hoplimit, flowlabel, priority */
-       memcpy(&saddr, &ipv6_hdr(skb)->saddr, sizeof(saddr));
---- a/net/netfilter/nf_tables_netdev.c
-+++ b/net/netfilter/nf_tables_netdev.c
-@@ -21,15 +21,17 @@ nft_do_chain_netdev(void *priv, struct s
- {
-       struct nft_pktinfo pkt;
-+      nft_set_pktinfo(&pkt, skb, state);
-+
-       switch (skb->protocol) {
-       case htons(ETH_P_IP):
--              nft_set_pktinfo_ipv4_validate(&pkt, skb, state);
-+              nft_set_pktinfo_ipv4_validate(&pkt, skb);
-               break;
-       case htons(ETH_P_IPV6):
--              nft_set_pktinfo_ipv6_validate(&pkt, skb, state);
-+              nft_set_pktinfo_ipv6_validate(&pkt, skb);
-               break;
-       default:
--              nft_set_pktinfo_unspec(&pkt, skb, state);
-+              nft_set_pktinfo_unspec(&pkt, skb);
-               break;
-       }
diff --git a/target/linux/generic/backport-4.14/301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch b/target/linux/generic/backport-4.14/301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch
deleted file mode 100644 (file)
index 80fd367..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-From: Florian Westphal <fw@strlen.de>
-Date: Fri, 8 Dec 2017 17:01:54 +0100
-Subject: [PATCH] netfilter: core: only allow one nat hook per hook point
-
-The netfilter NAT core cannot deal with more than one NAT hook per hook
-location (prerouting, input ...), because the NAT hooks install a NAT null
-binding in case the iptables nat table (iptable_nat hooks) or the
-corresponding nftables chain (nft nat hooks) doesn't specify a nat
-transformation.
-
-Null bindings are needed to detect port collsisions between NAT-ed and
-non-NAT-ed connections.
-
-This causes nftables NAT rules to not work when iptable_nat module is
-loaded, and vice versa because nat binding has already been attached
-when the second nat hook is consulted.
-
-The netfilter core is not really the correct location to handle this
-(hooks are just hooks, the core has no notion of what kinds of side
- effects a hook implements), but its the only place where we can check
-for conflicts between both iptables hooks and nftables hooks without
-adding dependencies.
-
-So add nat annotation to hook_ops to describe those hooks that will
-add NAT bindings and then make core reject if such a hook already exists.
-The annotation fills a padding hole, in case further restrictions appar
-we might change this to a 'u8 type' instead of bool.
-
-iptables error if nft nat hook active:
-iptables -t nat -A POSTROUTING -j MASQUERADE
-iptables v1.4.21: can't initialize iptables table `nat': File exists
-Perhaps iptables or your kernel needs to be upgraded.
-
-nftables error if iptables nat table present:
-nft -f /etc/nftables/ipv4-nat
-/usr/etc/nftables/ipv4-nat:3:1-2: Error: Could not process rule: File exists
-table nat {
-^^
-
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
-
---- a/include/linux/netfilter.h
-+++ b/include/linux/netfilter.h
-@@ -67,6 +67,7 @@ struct nf_hook_ops {
-       struct net_device       *dev;
-       void                    *priv;
-       u_int8_t                pf;
-+      bool                    nat_hook;
-       unsigned int            hooknum;
-       /* Hooks are ordered in ascending priority. */
-       int                     priority;
---- a/net/ipv4/netfilter/iptable_nat.c
-+++ b/net/ipv4/netfilter/iptable_nat.c
-@@ -72,6 +72,7 @@ static const struct nf_hook_ops nf_nat_i
-       {
-               .hook           = iptable_nat_ipv4_in,
-               .pf             = NFPROTO_IPV4,
-+              .nat_hook       = true,
-               .hooknum        = NF_INET_PRE_ROUTING,
-               .priority       = NF_IP_PRI_NAT_DST,
-       },
-@@ -79,6 +80,7 @@ static const struct nf_hook_ops nf_nat_i
-       {
-               .hook           = iptable_nat_ipv4_out,
-               .pf             = NFPROTO_IPV4,
-+              .nat_hook       = true,
-               .hooknum        = NF_INET_POST_ROUTING,
-               .priority       = NF_IP_PRI_NAT_SRC,
-       },
-@@ -86,6 +88,7 @@ static const struct nf_hook_ops nf_nat_i
-       {
-               .hook           = iptable_nat_ipv4_local_fn,
-               .pf             = NFPROTO_IPV4,
-+              .nat_hook       = true,
-               .hooknum        = NF_INET_LOCAL_OUT,
-               .priority       = NF_IP_PRI_NAT_DST,
-       },
-@@ -93,6 +96,7 @@ static const struct nf_hook_ops nf_nat_i
-       {
-               .hook           = iptable_nat_ipv4_fn,
-               .pf             = NFPROTO_IPV4,
-+              .nat_hook       = true,
-               .hooknum        = NF_INET_LOCAL_IN,
-               .priority       = NF_IP_PRI_NAT_SRC,
-       },
---- a/net/ipv6/netfilter/ip6table_nat.c
-+++ b/net/ipv6/netfilter/ip6table_nat.c
-@@ -74,6 +74,7 @@ static const struct nf_hook_ops nf_nat_i
-       {
-               .hook           = ip6table_nat_in,
-               .pf             = NFPROTO_IPV6,
-+              .nat_hook       = true,
-               .hooknum        = NF_INET_PRE_ROUTING,
-               .priority       = NF_IP6_PRI_NAT_DST,
-       },
-@@ -81,6 +82,7 @@ static const struct nf_hook_ops nf_nat_i
-       {
-               .hook           = ip6table_nat_out,
-               .pf             = NFPROTO_IPV6,
-+              .nat_hook       = true,
-               .hooknum        = NF_INET_POST_ROUTING,
-               .priority       = NF_IP6_PRI_NAT_SRC,
-       },
-@@ -88,12 +90,14 @@ static const struct nf_hook_ops nf_nat_i
-       {
-               .hook           = ip6table_nat_local_fn,
-               .pf             = NFPROTO_IPV6,
-+              .nat_hook       = true,
-               .hooknum        = NF_INET_LOCAL_OUT,
-               .priority       = NF_IP6_PRI_NAT_DST,
-       },
-       /* After packet filtering, change source */
-       {
-               .hook &