Browse Source

qcacld-3.0: Use ENTER_DEV() in HostAP private WEXT ioctls

The ENTER_DEV macro was introduced to log both the function and device
name when a function is entered.  Update all HostAP-mode private
wireless extensions ioctl handlers to use this macro.

Change-Id: I746788be7dd9a0d5317b483908adde22d96413dc
CRs-Fixed: 975414
Jeff Johnson 9 years ago
parent
commit
0205031ea9
1 changed files with 27 additions and 24 deletions
  1. 27 24
      core/hdd/src/wlan_hdd_hostapd.c

+ 27 - 24
core/hdd/src/wlan_hdd_hostapd.c

@@ -2100,10 +2100,7 @@ static __iw_softap_set_ini_cfg(struct net_device *dev,
 	hdd_adapter_t *pAdapter = (netdev_priv(dev));
 	hdd_context_t *pHddCtx;
 
-	if (pAdapter == NULL) {
-		hddLog(LOGE, FL("pAdapter is NULL!"));
-		return -EINVAL;
-	}
+	ENTER_DEV(dev);
 
 	pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 	ret = wlan_hdd_validate_context(pHddCtx);
@@ -2145,12 +2142,13 @@ static __iw_softap_get_ini_cfg(struct net_device *dev,
 	hdd_context_t *pHddCtx;
 	int ret = 0;
 
+	ENTER_DEV(dev);
+
 	pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 	ret = wlan_hdd_validate_context(pHddCtx);
-	if (ret != 0) {
-		hddLog(LOGE, FL("HDD context is not valid"));
+	if (ret != 0)
 		return ret;
-	}
+
 	hddLog(LOG1, FL("Printing CLD global INI Config"));
 	hdd_cfg_get_global_config(pHddCtx, extra, QCSAP_IOCTL_MAX_STR_LEN);
 	wrqu->data.length = strlen(extra) + 1;
@@ -2191,6 +2189,8 @@ static int __iw_softap_set_two_ints_getnone(struct net_device *dev,
 	int sub_cmd = value[0];
 	hdd_context_t *hdd_ctx;
 
+	ENTER_DEV(dev);
+
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (ret != 0)
@@ -2334,7 +2334,7 @@ static __iw_softap_setparam(struct net_device *dev,
 	v_CONTEXT_t p_cds_context;
 	hdd_context_t *hdd_ctx;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter);
 	ret = wlan_hdd_validate_context(hdd_ctx);
@@ -2997,7 +2997,7 @@ static __iw_softap_getparam(struct net_device *dev,
 	int ret;
 	hdd_context_t *hdd_ctx;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter);
 	ret = wlan_hdd_validate_context(hdd_ctx);
@@ -3242,7 +3242,7 @@ int __iw_softap_modify_acl(struct net_device *dev,
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 	hdd_context_t *hdd_ctx;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter);
 	ret = wlan_hdd_validate_context(hdd_ctx);
@@ -3310,7 +3310,7 @@ static __iw_softap_getchannel(struct net_device *dev,
 	int *value = (int *)extra;
 	int ret;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter);
 	ret = wlan_hdd_validate_context(hdd_ctx);
@@ -3353,7 +3353,7 @@ static __iw_softap_set_max_tx_power(struct net_device *dev,
 	struct qdf_mac_addr bssid = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
 	struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BROADCAST_INITIALIZER;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (NULL == value)
 		return -ENOMEM;
@@ -3404,7 +3404,7 @@ static __iw_softap_set_tx_power(struct net_device *dev,
 	struct qdf_mac_addr bssid;
 	int ret;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter);
 	ret = wlan_hdd_validate_context(hdd_ctx);
@@ -3458,7 +3458,7 @@ static __iw_softap_getassoc_stamacaddr(struct net_device *dev,
 	/* maclist_index must be u32 to match userspace */
 	u32 maclist_index;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	/*
 	 * NOTE WELL: this is a "get" ioctl but it uses an even ioctl
@@ -3558,7 +3558,7 @@ static __iw_softap_disassoc_sta(struct net_device *dev,
 	uint8_t *peerMacAddr;
 	int ret;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (!capable(CAP_NET_ADMIN)) {
 		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
@@ -3615,7 +3615,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 	int sub_cmd = wrqu->data.flags;
 	hdd_context_t *hdd_ctx;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	ret = wlan_hdd_validate_context(hdd_ctx);
@@ -3658,6 +3658,8 @@ static int wlan_hdd_set_force_acs_ch_range(struct net_device *dev,
 	hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	int *value = (int *)extra;
 
+	ENTER_DEV(dev);
+
 	if (!capable(CAP_NET_ADMIN)) {
 		hddLog(LOGE, FL("permission check failed"));
 		return -EPERM;
@@ -3702,6 +3704,8 @@ static int __iw_softap_get_channel_list(struct net_device *dev,
 	hdd_context_t *hdd_ctx;
 	int ret;
 
+	ENTER_DEV(dev);
+
 	hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter);
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (0 != ret)
@@ -3712,7 +3716,6 @@ static int __iw_softap_get_channel_list(struct net_device *dev,
 		return -EIO;
 	}
 	wrqu->data.length = sizeof(tChannelListInfo);
-	ENTER();
 
 	if (eCSR_BAND_24 == curBand) {
 		bandStartChannel = RF_CHAN_1;
@@ -3774,7 +3777,7 @@ int __iw_get_genie(struct net_device *dev,
 	uint32_t length = DOT11F_IE_RSN_MAX_LEN;
 	uint8_t genIeBytes[DOT11F_IE_RSN_MAX_LEN];
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter);
 	ret = wlan_hdd_validate_context(hdd_ctx);
@@ -3846,7 +3849,7 @@ int __iw_get_wpspbc_probe_req_ies(struct net_device *dev,
 	hdd_context_t *hdd_ctx;
 	int ret;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter);
 	ret = wlan_hdd_validate_context(hdd_ctx);
@@ -4459,7 +4462,7 @@ __iw_softap_setwpsie(struct net_device *dev,
 	hdd_context_t *hdd_ctx;
 	int ret;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	if (!capable(CAP_NET_ADMIN)) {
 		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
@@ -5045,7 +5048,7 @@ __iw_softap_stopbss(struct net_device *dev,
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 	hdd_context_t *hdd_ctx;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter);
 	status = wlan_hdd_validate_context(hdd_ctx);
@@ -5108,7 +5111,7 @@ __iw_softap_version(struct net_device *dev,
 	hdd_context_t *hdd_ctx;
 	int ret;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter);
 	ret = wlan_hdd_validate_context(hdd_ctx);
@@ -5194,7 +5197,7 @@ static int __iw_softap_get_sta_info(struct net_device *dev,
 	hdd_context_t *hdd_ctx;
 	int ret;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter);
 	ret = wlan_hdd_validate_context(hdd_ctx);
@@ -5341,7 +5344,7 @@ int __iw_get_softap_linkspeed(struct net_device *dev,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	int rc, valid, i;
 
-	ENTER();
+	ENTER_DEV(dev);
 
 	hdd_ctx = WLAN_HDD_GET_CTX(pHostapdAdapter);
 	valid = wlan_hdd_validate_context(hdd_ctx);