shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

wifi: fix iptable forward cmd issue[1/1]

Browse Source 
PD#147462: add some iptabe nat support to fix android NatController
cmd issue

Change-Id: Ia2e8e4f14898c5e3c6b2e2b61007260ff74db193
Signed-off-by: Rongjun Chen <rongjun.chen@amlogic.com>
This commit is contained in:
Rongjun Chen
2017-07-25 16:20:39 +08:00
committed by Jianxin Pan
parent fe0ed6cf13
commit 6041ed31a0
7 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
View File

@@ -144,6 +144,7 @@
interrupt_pin = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
interrupts = < 0 68 4>;
irq_trigger_type = "GPIO_IRQ_LOW";
dhd_static_buf; //dhd_static_buf support
power_on_pin = <&gpio GPIOX_6 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&wifi_32k_pins>;

1
arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
View File

@@ -145,6 +145,7 @@
interrupt_pin = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
interrupts = < 0 68 4>;
irq_trigger_type = "GPIO_IRQ_LOW";
dhd_static_buf; //dhd_static_buf support
power_on_pin = <&gpio GPIOX_6 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&wifi_32k_pins>;

14
arch/arm64/configs/meson64_defconfig
View File

@@ -90,6 +90,7 @@ CONFIG_NETFILTER_XT_TARGET_NFLOG=y
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
CONFIG_NETFILTER_XT_TARGET_TPROXY=y
CONFIG_NETFILTER_XT_TARGET_TRACE=y
CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
CONFIG_NETFILTER_XT_MATCH_COMMENT=y
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
@@ -104,7 +105,10 @@ CONFIG_NETFILTER_XT_MATCH_MAC=y
CONFIG_NETFILTER_XT_MATCH_MARK=y
CONFIG_NETFILTER_XT_MATCH_POLICY=y
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
CONFIG_NETFILTER_XT_MATCH_QUOTA=y
CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
CONFIG_NETFILTER_XT_MATCH_SOCKET=y
CONFIG_NETFILTER_XT_MATCH_STATE=y
CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
@@ -112,25 +116,31 @@ CONFIG_NETFILTER_XT_MATCH_STRING=y
CONFIG_NETFILTER_XT_MATCH_TIME=y
CONFIG_NETFILTER_XT_MATCH_U32=y
CONFIG_NF_CONNTRACK_IPV4=y
CONFIG_NF_NAT_IPV4=y
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP_NF_MATCH_AH=y
CONFIG_IP_NF_MATCH_ECN=y
CONFIG_IP_NF_MATCH_TTL=y
CONFIG_IP_NF_FILTER=y
CONFIG_IP_NF_TARGET_REJECT=y
CONFIG_IP_NF_NAT=y
CONFIG_IP_NF_TARGET_MASQUERADE=y
CONFIG_IP_NF_TARGET_NETMAP=y
CONFIG_IP_NF_TARGET_REDIRECT=y
CONFIG_IP_NF_MANGLE=y
CONFIG_IP_NF_RAW=y
CONFIG_IP_NF_ARPTABLES=y
CONFIG_IP_NF_ARPFILTER=y
CONFIG_IP_NF_ARP_MANGLE=y
CONFIG_NF_CONNTRACK_IPV6=y
CONFIG_NF_NAT_IPV6=y
CONFIG_IP6_NF_IPTABLES=y
CONFIG_IP6_NF_MATCH_RPFILTER=y
CONFIG_IP6_NF_FILTER=y
CONFIG_IP6_NF_TARGET_REJECT=y
CONFIG_IP6_NF_MANGLE=y
CONFIG_IP6_NF_RAW=y
CONFIG_IP6_NF_NAT=y
CONFIG_IP6_NF_TARGET_MASQUERADE=y
CONFIG_IP6_NF_TARGET_NPT=y
CONFIG_L2TP=y
CONFIG_L2TP_DEBUGFS=y
CONFIG_L2TP_V3=y

2
drivers/amlogic/wifi/Makefile
View File

@@ -1 +1 @@
obj-$(CONFIG_AMLOGIC_WIFI) += wifi_dt.o
obj-$(CONFIG_AMLOGIC_WIFI) += wifi_dt.o dhd_static_buf.o

20
drivers/amlogic/wifi/dhd_static_buf.c
View File

@@ -185,20 +185,6 @@ err_skb_alloc:
}
EXPORT_SYMBOL(bcmdhd_init_wlan_mem);
#endif /* CONFIG_BROADCOM_WIFI_RESERVED_MEM */
#if 0
static int __init bcmdhd_wlan_init(void)
{
pr_info("%s()\n", __func__);
#ifdef CONFIG_BROADCOM_WIFI_RESERVED_MEM
bcmdhd_init_wlan_mem();
#endif
return 0;
}
device_initcall(bcmdhd_wlan_init);
#endif
MODULE_DESCRIPTION("Amlogic S912/wifi driver");
MODULE_AUTHOR("Kevin Hilman <khilman@baylibre.com>");
MODULE_LICENSE("GPL")
MODULE_LICENSE("GPL");
MODULE_AUTHOR("AMLOGIC");
MODULE_DESCRIPTION("wifi device tree driver");

4
drivers/amlogic/wifi/wifi_dt.c
View File

@@ -16,9 +16,7 @@
*/
#include <linux/amlogic/wifi_dt.h>
#ifdef CONFIG_BCMDHD_USE_STATIC_BUF
#include <linux/amlogic/dhd_buf.h>
#endif
#include <linux/module.h>
#include <linux/interrupt.h>
@@ -609,13 +607,11 @@ static int wifi_dev_probe(struct platform_device *pdev)
aml_write_cbus(0x21b2, pwm_misc);
aml_write_cbus(0x21b2, (pwm_misc | (1 << 0)));
}
#ifdef CONFIG_BCMDHD_USE_STATIC_BUF
if (of_get_property(pdev->dev.of_node,
"dhd_static_buf", NULL)) {
WIFI_INFO("dhd_static_buf setup\n");
bcmdhd_init_wlan_mem();
}
#endif
plat->plat_info_valid = 1;

4
include/linux/amlogic/dhd_buf.h Normal file
View File

@@ -0,0 +1,4 @@
#ifndef _BCMDHD_BUF_H
#define _BCMDHD_BUF_H
int bcmdhd_init_wlan_mem(void);
#endif