M7350v2_en_gpl
This commit is contained in:
@ -1030,8 +1030,10 @@ int ath6kl_send_msg_ipa(struct ath6kl_vif *vif, enum ipa_wlan_event type,
|
||||
"IPA-CM: AP mode Adding Partial hdr: %s, %pM\n",
|
||||
vif->ndev->name, vif->ndev->dev_addr);
|
||||
/* Add partial header with IPA for this interface */
|
||||
ath6kl_ipa_add_header_info(vif->ar, 1, vif->fw_vif_idx,
|
||||
vif->ndev->name, vif->ndev->dev_addr);
|
||||
if (!(test_bit(CONNECTED, &vif->flags))) {
|
||||
ath6kl_ipa_add_header_info(vif->ar, 1, vif->fw_vif_idx,
|
||||
vif->ndev->name, vif->ndev->dev_addr);
|
||||
}
|
||||
break;
|
||||
|
||||
case WLAN_AP_DISCONNECT:
|
||||
|
@ -1182,6 +1182,25 @@ static void ath6kl_usb_flush_all(struct ath6kl_usb *ar_usb)
|
||||
#endif
|
||||
}
|
||||
|
||||
static void ath6kl_usb_suspend_flush_all(struct ath6kl_usb *ar_usb)
|
||||
{
|
||||
int i;
|
||||
struct ath6kl_usb_pipe *pipe;
|
||||
|
||||
for (i = 0; i < ATH6KL_USB_PIPE_MAX; i++) {
|
||||
pipe = &ar_usb->pipes[i].ar_usb->pipes[i];
|
||||
if (!pipe->ar_usb)
|
||||
continue;
|
||||
flush_work(&pipe->tx_io_complete_work);
|
||||
flush_work(&pipe->rx_io_complete_work);
|
||||
usb_kill_anchored_urbs(&pipe->urb_submitted);
|
||||
|
||||
}
|
||||
#ifdef CONFIG_ATH6KL_AUTO_PM
|
||||
flush_work(&ar_usb->pm_resume_work);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void ath6kl_usb_start_recv_pipes(struct ath6kl_usb *ar_usb)
|
||||
{
|
||||
/*
|
||||
@ -1421,6 +1440,7 @@ static void ath6kl_usb_destroy(struct ath6kl_usb *ar_usb)
|
||||
ath6kl_usb_flush_all(ar_usb);
|
||||
|
||||
#ifdef CONFIG_ATH6KL_AUTO_PM
|
||||
spin_lock_bh(&ar_usb->pm_lock);
|
||||
while (!list_empty(&ar_usb->pm_q)) {
|
||||
struct ath6kl_urb_context *urb_context;
|
||||
|
||||
@ -1430,6 +1450,7 @@ static void ath6kl_usb_destroy(struct ath6kl_usb *ar_usb)
|
||||
list_del(&urb_context->link);
|
||||
ath6kl_usb_cleanup_urb_context(urb_context);
|
||||
}
|
||||
spin_unlock_bh(&ar_usb->pm_lock);
|
||||
#endif
|
||||
|
||||
ath6kl_usb_cleanup_pipe_resources(ar_usb);
|
||||
@ -2463,7 +2484,7 @@ end:
|
||||
return ret;
|
||||
}
|
||||
|
||||
ath6kl_usb_flush_all(ar_usb);
|
||||
ath6kl_usb_suspend_flush_all(ar_usb);
|
||||
#ifdef CONFIG_ATH6KL_AUTO_PM
|
||||
atomic_set(&ar_usb->autopm_state,
|
||||
ATH6KL_USB_AUTOPM_STATE_SUSPENDED);
|
||||
|
30
external/hostap/hostapd/Makefile
vendored
Normal file → Executable file
30
external/hostap/hostapd/Makefile
vendored
Normal file → Executable file
@ -862,14 +862,42 @@ verify_config:
|
||||
fi
|
||||
|
||||
install: all
|
||||
ifndef CONFIG_TP_WLAN_MODULE_BCM
|
||||
mkdir -p $(DESTDIR)/usr/bin
|
||||
for i in $(ALL); do cp -f $$i $(DESTDIR)/usr/bin/$$i; done
|
||||
endif
|
||||
|
||||
mkdir -p $(DESTDIR)/etc
|
||||
ifdef CONFIG_DRIVER_AR6000
|
||||
install -m 0644 config/ar6k-ap-all.conf $(DESTDIR)/etc/AR6003_hostapd.conf
|
||||
install -m 0644 config/ar6k-ap1-all.conf $(DESTDIR)/etc/AR6003_AP1_hostapd.conf
|
||||
endif
|
||||
|
||||
ifdef CONFIG_TP_WLAN_MODULE_BCM
|
||||
|
||||
ifdef CONFIG_WIRELESS_ACL_TYPE_BLACK
|
||||
#[liyuan start] M7350 series enable acl deny list in default
|
||||
install -m 0644 -d $(DESTDIR)/etc/config
|
||||
install -m 0644 config/tp-bcm-ap-all-7350-series.conf $(DESTDIR)/etc/AR6004_hostapd.conf
|
||||
install -m 0644 config/tp-bcm-ap-all-7350-series.deny $(DESTDIR)/etc/config/hostapd.deny
|
||||
ln -s /etc/AR6004_hostapd.conf $(DESTDIR)/etc/hostapd.conf
|
||||
|
||||
install -m 0644 -d $(DESTDIR)/etc/default_config
|
||||
install -m 0644 config/tp-bcm-ap-all-7350-series.conf $(DESTDIR)/etc/default_config/AR6004_hostapd.conf
|
||||
install -m 0644 config/tp-bcm-ap-all-7350-series.deny $(DESTDIR)/etc/default_config/hostapd.deny
|
||||
#[liyuan end]
|
||||
else
|
||||
#[lixiangkui start] install wifi default config
|
||||
install -m 0644 config/tp-bcm-ap-all.conf $(DESTDIR)/etc/AR6004_hostapd.conf
|
||||
ln -s /etc/AR6004_hostapd.conf $(DESTDIR)/etc/hostapd.conf
|
||||
|
||||
install -m 0644 -d $(DESTDIR)/etc/default_config
|
||||
install -m 0644 config/tp-bcm-ap-all.conf $(DESTDIR)/etc/default_config/AR6004_hostapd.conf
|
||||
#[lixiangkui end]
|
||||
endif
|
||||
|
||||
else
|
||||
|
||||
ifdef CONFIG_DRIVER_NL80211
|
||||
ifdef CONFIG_WIRELESS_ACL_TYPE_BLACK
|
||||
#[liyuan start] M7350 series enable acl deny list in default
|
||||
@ -896,6 +924,8 @@ else
|
||||
endif
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
../src/drivers/build.hostapd:
|
||||
@if [ -f ../src/drivers/build.wpa_supplicant ]; then \
|
||||
$(MAKE) -C ../src/wps clean; \
|
||||
|
@ -10,4 +10,4 @@ ignore_broadcast_ssid=0
|
||||
ieee80211n=1
|
||||
ht_capab=[HT40-][SHORT-GI-20][SHORT-GI-40]
|
||||
require_ht=0
|
||||
max_num_sta=15
|
||||
max_num_sta=15
|
||||
|
15
external/hostap/hostapd/config/tp-bcm-ap-all-7350-series.conf
vendored
Normal file
15
external/hostap/hostapd/config/tp-bcm-ap-all-7350-series.conf
vendored
Normal file
@ -0,0 +1,15 @@
|
||||
interface=wlan0
|
||||
bridge=br0
|
||||
driver=nl80211
|
||||
ctrl_interface=/var/run/hostapd
|
||||
wmode=2
|
||||
channel=0
|
||||
auto_chan_select=2
|
||||
auth_algs=1
|
||||
ignore_broadcast_ssid=0
|
||||
ieee80211n=1
|
||||
ht_capab=[HT40-][SHORT-GI-20][SHORT-GI-40]
|
||||
require_ht=0
|
||||
max_num_sta=15
|
||||
macaddr_acl=3
|
||||
deny_mac_file=/etc/config/hostapd.deny
|
0
external/hostap/hostapd/config/tp-bcm-ap-all-7350-series.deny
vendored
Normal file
0
external/hostap/hostapd/config/tp-bcm-ap-all-7350-series.deny
vendored
Normal file
13
external/hostap/hostapd/config/tp-bcm-ap-all.conf
vendored
Normal file
13
external/hostap/hostapd/config/tp-bcm-ap-all.conf
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
interface=wlan0
|
||||
bridge=br0
|
||||
driver=nl80211
|
||||
ctrl_interface=/var/run/hostapd
|
||||
wmode=2
|
||||
channel=0
|
||||
auto_chan_select=2
|
||||
auth_algs=1
|
||||
ignore_broadcast_ssid=0
|
||||
ieee80211n=1
|
||||
ht_capab=[HT40-][SHORT-GI-20][SHORT-GI-40]
|
||||
require_ht=0
|
||||
max_num_sta=15
|
6
external/hostap/src/ap/ieee802_11_ht.c
vendored
6
external/hostap/src/ap/ieee802_11_ht.c
vendored
@ -308,6 +308,8 @@ static int is_40_allowed(struct hostapd_iface *iface, int channel)
|
||||
|
||||
void ap_ht2040_timeout(void *eloop_data, void *user_data)
|
||||
{
|
||||
//[lixiangkui 20150417] Fix Bug#74496, don't switch to 40MHz
|
||||
#if 0
|
||||
struct hostapd_data *hapd = eloop_data;
|
||||
|
||||
wpa_printf(MSG_INFO, "Switching to 40MHz operation");
|
||||
@ -316,7 +318,9 @@ void ap_ht2040_timeout(void *eloop_data, void *user_data)
|
||||
HT_OPMODE_SWITCH_TO_40);
|
||||
hapd->ht_40 = TRUE;
|
||||
hapd->iconf->secondary_channel = hapd->secondary_ch;
|
||||
|
||||
#else
|
||||
wpa_printf(MSG_INFO, "Don't switching to 40MHz!");
|
||||
#endif
|
||||
}
|
||||
void hostapd_2040_coex_action(struct hostapd_data *hapd,
|
||||
const struct ieee80211_mgmt *mgmt, size_t len)
|
||||
|
Reference in New Issue
Block a user