diff --git a/core/hdd/inc/wlan_hdd_softap_tx_rx.h b/core/hdd/inc/wlan_hdd_softap_tx_rx.h index 771e63012dca7..8949daa1f9470 100644 --- a/core/hdd/inc/wlan_hdd_softap_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_softap_tx_rx.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -75,14 +75,25 @@ QDF_STATUS hdd_softap_rx_mul_packet_cbk(void *cds_context, QDF_STATUS hdd_softap_deregister_sta(struct hdd_adapter *adapter, uint8_t staId); + +/** + * hdd_softap_register_sta() - Register a SoftAP STA + * @adapter: pointer to adapter context + * @fAuthRequired: is additional authentication required? + * @fPrivacyBit: should 802.11 privacy bit be set? + * @staId: station ID assigned to this station + * @pPeerMacAddress: station MAC address + * @fWmmEnabled: is WMM enabled for this STA? + * + * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error + */ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter, bool fAuthRequired, bool fPrivacyBit, uint8_t staId, - uint8_t ucastSig, - uint8_t bcastSig, struct qdf_mac_addr *pPeerMacAddress, bool fWmmEnabled); + QDF_STATUS hdd_softap_register_bc_sta(struct hdd_adapter *adapter, bool fPrivacyBit); QDF_STATUS hdd_softap_deregister_bc_sta(struct hdd_adapter *adapter); diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 56a2a6f0107c2..ea5bb04fa1f48 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -2131,7 +2131,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, adapter, true, ap_ctx->privacy, - event->staId, 0, 0, + event->staId, (struct qdf_mac_addr *) wrqu.addr.sa_data, event->wmmEnabled); @@ -2144,7 +2144,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, adapter, false, ap_ctx->privacy, - event->staId, 0, 0, + event->staId, (struct qdf_mac_addr *) wrqu.addr.sa_data, event->wmmEnabled); diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c index b6441bff43dc2..af2812d1dd2a5 100644 --- a/core/hdd/src/wlan_hdd_softap_tx_rx.c +++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c @@ -882,25 +882,10 @@ QDF_STATUS hdd_softap_deregister_sta(struct hdd_adapter *adapter, return qdf_status; } -/** - * hdd_softap_register_sta() - Register a SoftAP STA - * @adapter: pointer to adapter context - * @fAuthRequired: is additional authentication required? - * @fPrivacyBit: should 802.11 privacy bit be set? - * @staId: station ID assigned to this station - * @ucastSig: unicast security signature - * @bcastSig: broadcast security signature - * @pPeerMacAddress: station MAC address - * @fWmmEnabled: is WMM enabled for this STA? - * - * Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_** on error - */ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter, bool fAuthRequired, bool fPrivacyBit, uint8_t staId, - uint8_t ucastSig, - uint8_t bcastSig, struct qdf_mac_addr *pPeerMacAddress, bool fWmmEnabled) { @@ -1014,7 +999,7 @@ QDF_STATUS hdd_softap_register_bc_sta(struct hdd_adapter *adapter, qdf_status = hdd_softap_register_sta(adapter, false, fPrivacyBit, ap_ctx->broadcast_sta_id, - 0, 1, &broadcastMacAddr, 0); + &broadcastMacAddr, 0); return qdf_status; }