Florian Fainelli d73dc14957 kernel: 3.18: Fix patch 644 dependency chain ...

This patch introduces some code that is compiled in whenever
CONFIG_BRIDGE_NETFILTER is built, with the code called from code compiled under
CONFIG_BRIDGE, CONFIG_BRIDGE_IGMP_SNOOPING or CONFIG_BRIDGE_NF_EBTABLES.

Unfortunately, these options aren't setting explicitly the dependency they now
have on CONFIG_BRIDGE_NETFILTER, for obvious reasons for CONFIG_BRIDGE.

However, this is not working really well when CONFIG_BRIDGE_NETFILTER is built
as a module, since code statically compiled will now use a function that is not
in the kernel image, which makes the linker grumpy.

Solve this by removing the option to build CONFIG_BRIDGE_NETFILTER as a module,
and protect our function definition by an IS_BUILTIN instead of a IS_ENABLED
macro. This fixes the issue for CONFIG_BRIDGE and CONFIG_BRIDGE_IGMP_SNOOPING.

Fixing CONFIG_BRIDGE_NF_EBTABLES has to be handled a bit differently, since it
directly references a variable that will not be declared if
CONFIG_BRIDGE_NETFILTER is not set. Protect the variable affectations by an
ifdef to make sure this doesn't happen.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 43419

2014-11-28 01:29:51 +00:00

..

000-keep_initrafs_the_default.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

040-mtd-bcm47xxpart-backports-from-3.19.patch

kernel: backport bcm47xxpart changes queued for 3.19

2014-11-08 21:41:21 +00:00

102-ehci_hcd_ignore_oc.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

120-bridge_allow_receiption_on_disabled_port.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

132-mips_inline_dma_ops.patch

kernel: add patch header and missing part in 132-mips_inline_dma_ops.patch again

2014-10-31 23:32:22 +00:00

200-fix_localversion.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

201-extra_optimization.patch

update .18 support for -rc6

2014-11-24 10:17:33 +00:00

202-reduce_module_size.patch

update .18 support for -rc6

2014-11-24 10:17:33 +00:00

203-kallsyms_uncompressed.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

204-module_strip.patch

kernel: update kernel 3.18 to rc4

2014-11-10 22:51:30 +00:00

210-darwin_scripts_include.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

212-byteshift_portability.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

220-gc_sections.patch

kernel: add missing KEEP() statements for gc-sections patch in 3.18

2014-11-27 16:24:25 +00:00

221-module_exports.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

230-openwrt_lzma_options.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

250-netfilter_depends.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

251-sound_kconfig.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

252-mv_cesa_depends.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

253-ssb_b43_default_on.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

254-textsearch_kconfig_hacks.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

255-lib80211_kconfig_hacks.patch

mac80211: configuration: Better handling of LIB80211 configuration

2014-10-31 23:27:27 +00:00

256-crypto_add_kconfig_prompts.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

257-wireless_ext_kconfig_hack.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

258-netfilter_netlink_kconfig_hack.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

259-regmap_dynamic.patch

kernel: add closing " to REGMAP_I2C's tristate

2014-10-27 23:14:21 +00:00

260-crypto_test_dependencies.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

261-move_bcm963xx_tag.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

262-compressor_kconfig_hack.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

300-mips_expose_boot_raw.patch

kernel: add patch header and missing part in 132-mips_inline_dma_ops.patch again

2014-10-31 23:32:22 +00:00

301-mips_image_cmdline_hack.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

302-mips_no_branch_likely.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

304-mips_disable_fpu.patch

kernel: update kernel 3.18 to rc4

2014-11-10 22:51:30 +00:00

305-mips_module_reloc.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

306-mips_mem_functions_performance.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

309-mips_fuse_workaround.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

310-arm_module_unresolved_weak_sym.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

320-ppc4xx_optimization.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

321-powerpc_crtsavres_prereq.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

400-mtd-add-rootfs-split-support.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

401-mtd-add-support-for-different-partition-parser-types.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

403-mtd-hook-mtdsplit-to-Kbuild.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

405-mtd-add-more-helper-functions.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

406-mtd-hook-mtdsplit-into-Kbuild.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

408-mtd-old-rootfs-squashfs-splitter.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

410-mtd-move-forward-declaration-of-struct-mtd_info.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

411-mtd-partial_eraseblock_write.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

412-mtd-partial_eraseblock_unlock.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

420-mtd-redboot_space.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

430-mtd-add-myloader-partition-parser.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

431-mtd-bcm47xxpart-support-TRX-data-partition-being-UBI.patch

kernel: backport bcm47xxpart changes queued for 3.19

2014-11-08 21:41:21 +00:00

440-block2mtd_init.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

441-block2mtd_probe.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

451-mtd-nand-fix-return-code-of-nand_correct_data-function.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

460-mtd-cfi_cmdset_0002-no-erase_suspend.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch

kernel: update kernel 3.18 to rc4

2014-11-10 22:51:30 +00:00

480-mtd-set-rootfs-to-be-root-dev.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

491-ubi-auto-create-ubiblock-device-for-rootfs.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

493-ubi-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

500-yaffs-Kbuild-integration.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

501-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

502-yaffs-3.10-disable-proc-entry.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

503-yaffs-3.12-convert-readdir-to-iterate.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

503-yaffs-add-tags-9bytes-mount-option.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

504-yaffs-fix-compat-tags-handling.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

520-squashfs_update_xz_comp_opts.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

530-jffs2_make_lzma_available.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

531-debloat_lzma.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

532-jffs2_eofdetect.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

540-crypto-xz-decompression-support.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

541-ubifs-xz-decompression-support.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

550-ubifs-symlink-xattr-support.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

551-ubifs-fix-default-compression-selection.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

600-netfilter_layer7_2.22.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

601-netfilter_layer7_pktmatch.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

602-netfilter_layer7_match.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

603-netfilter_layer7_2.6.36_fix.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

604-netfilter_conntrack_flush.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

610-netfilter_match_bypass_default_checks.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

611-netfilter_match_bypass_default_table.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

612-netfilter_match_reduce_memory_access.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

613-netfilter_optional_tcp_window_check.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

615-netfilter_add_xt_id_match.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

616-net_optimize_xfrm_calls.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

617-netfilter_skip_filter_sysctl.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

620-sched_esfq.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

621-sched_act_connmark.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

630-packet_socket_type.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

640-bridge_no_eap_forward.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

641-bridge_always_accept_eap.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

642-bridge_port_isolate.patch

kernel: update kernel 3.18 to rc4

2014-11-10 22:51:30 +00:00

643-bridge_remove_ipv6_dependency.patch

kernel: update kernel 3.18 to rc4

2014-11-10 22:51:30 +00:00

644-bridge_optimize_netfilter_hooks.patch

kernel: 3.18: Fix patch 644 dependency chain

2014-11-28 01:29:51 +00:00

645-bridge_multicast_to_unicast.patch

update .18 support for -rc6

2014-11-24 10:17:33 +00:00

650-pppoe_header_pad.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

651-wireless_mesh_header.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

652-atm_header_changes.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

653-disable_netlink_trim.patch

kernel: update kernel 3.18 to rc4

2014-11-10 22:51:30 +00:00

655-increase_skb_pad.patch

kernel: update kernel 3.18 to rc4

2014-11-10 22:51:30 +00:00

656-skb_reduce_truesize-helper.patch

kernel: update kernel 3.18 to rc4

2014-11-10 22:51:30 +00:00

657-qdisc_reduce_truesize.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

660-fq_codel_defaults.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

661-fq_codel_keep_dropped_stats.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

662-use_fq_codel_by_default.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

663-remove_pfifo_fast.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

664-codel_fix_3_12.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

666-Add-support-for-MAP-E-FMRs-mesh-mode.patch

update .18 support for -rc6

2014-11-24 10:17:33 +00:00

670-ipv6-allow-rejecting-with-source-address-failed-policy.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

671-net-provide-defines-for-_POLICY_FAILED-until-all-cod.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

700-swconfig.patch

update .18 support for -rc6

2014-11-24 10:17:33 +00:00

701-phy_extension.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

702-phy_add_aneg_done_function.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

703-phy-add-detach-callback-to-struct-phy_driver.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

710-phy-add-mdio_register_board_info.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

720-phy_adm6996.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

721-phy_packets.patch

kernel: update kernel 3.18 to rc4

2014-11-10 22:51:30 +00:00

722-phy_mvswitch.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

723-phy_ip175c.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

724-phy_ar8216.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

725-phy_rtl8306.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

726-phy_rtl8366.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

727-phy-rtl8367.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

728-phy-micrel.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

729-phy-rtl8367b.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

729-phy-tantos.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

730-phy_b53.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

731-phy_mvswitch_3.10_compilation.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

732-phy-ar8216-led-support.patch

kernel: add missing patch for AR8216_PHY_LEDS

2014-10-31 23:53:32 +00:00

750-hostap_txpower.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

773-bgmac-add-srab-switch.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

775-bgmac-check-length-of-received-frame.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

780-igb-Fix-Null-pointer-dereference-in-igb_reset_q_vect.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

785-hso-support-0af0-9300.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

810-pci_disable_common_quirks.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

811-pci_disable_usb_common_quirks.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

820-usb_add_usb_find_device_by_name.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

830-ledtrig_morse.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

831-ledtrig_netdev.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

832-ledtrig_usbdev.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

840-rtc7301.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

841-rtc_pt7c4338.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

861-04_spi_gpio_implement_spi_delay.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

862-gpio_spi_driver.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

863-gpiommc.patch

update .18 support for -rc6

2014-11-24 10:17:33 +00:00

864-gpiommc_configfs_locking.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

870-hifn795x_byteswap.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

880-gateworks_system_controller.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

890-8250_optional_sysrq.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

900-slab_maxsize.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

901-debloat_sock_diag.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

902-debloat_proc.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

903-debloat_direct_io.patch

kernel: update kernel 3.18 to rc4

2014-11-10 22:51:30 +00:00

910-kobject_uevent.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

911-kobject_add_broadcast_uevent.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

921-use_preinit_as_init.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

922-always-create-console-node-in-initramfs.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

930-crashlog.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

940-ocf_kbuild_integration.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

941-ocf_20120127.patch

kernel: make the kernel 3.18 patches apply and boot on arm.

2014-10-27 22:55:39 +00:00

950-vm_exports.patch

update .18 support for -rc6

2014-11-24 10:17:33 +00:00

960-decompress_unlzo_fix.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

970-remove-unsane-filenames-from-deps_initramfs-list.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

980-arm_openwrt_machtypes.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

990-gpio_wdt.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

997-device_tree_cmdline.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00

998-enable_wilink_platform_without_drivers.patch

kernel: start working on 3.18 support

2014-10-27 18:14:39 +00:00