diff options
| author | DARAM SUDHA <dsudha@qti.qualcomm.com> | 2014-03-31 02:24:34 -0700 |
|---|---|---|
| committer | Akash Patel <c_akashp@qca.qualcomm.com> | 2014-04-10 07:12:45 -0700 |
| commit | 735d32af1dec343e8dc655e3c12df22353aede45 (patch) | |
| tree | 40ab886cb874a9109b32cb0b2698142bc6577fd1 | |
| parent | 425e82326c9b25b5f7feeddae9cf0249401f455f (diff) | |
wlan : rename wlan_hdd_action to wlan_hdd_mgmt_tx
The API name is changed to wlan_hdd_mgmt_tx, as the old API name
is not appropriate for managment call back.
Change-Id: I589ebbc0d096834594ce78c8a4c865b4110b8efb
CRs-Fixed: 641009
| -rw-r--r-- | CORE/HDD/inc/wlan_hdd_p2p.h | 8 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 2 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_main.c | 2 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_p2p.c | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/CORE/HDD/inc/wlan_hdd_p2p.h b/CORE/HDD/inc/wlan_hdd_p2p.h index f0cd804ac172..e654fffcc6e0 100644 --- a/CORE/HDD/inc/wlan_hdd_p2p.h +++ b/CORE/HDD/inc/wlan_hdd_p2p.h @@ -135,7 +135,7 @@ int wlan_hdd_check_remain_on_channel(hdd_adapter_t *pAdapter); void wlan_hdd_cancel_existing_remain_on_channel(hdd_adapter_t *pAdapter); #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) -int wlan_hdd_action( struct wiphy *wiphy, struct wireless_dev *wdev, +int wlan_hdd_mgmt_tx( struct wiphy *wiphy, struct wireless_dev *wdev, struct ieee80211_channel *chan, bool offchan, #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)) enum nl80211_channel_type channel_type, @@ -145,20 +145,20 @@ int wlan_hdd_action( struct wiphy *wiphy, struct wireless_dev *wdev, const u8 *buf, size_t len, bool no_cck, bool dont_wait_for_ack, u64 *cookie ); #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) -int wlan_hdd_action( struct wiphy *wiphy, struct net_device *dev, +int wlan_hdd_mgmt_tx( struct wiphy *wiphy, struct net_device *dev, struct ieee80211_channel *chan, bool offchan, enum nl80211_channel_type channel_type, bool channel_type_valid, unsigned int wait, const u8 *buf, size_t len, bool no_cck, bool dont_wait_for_ack, u64 *cookie ); #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) -int wlan_hdd_action( struct wiphy *wiphy, struct net_device *dev, +int wlan_hdd_mgmt_tx( struct wiphy *wiphy, struct net_device *dev, struct ieee80211_channel *chan, bool offchan, enum nl80211_channel_type channel_type, bool channel_type_valid, unsigned int wait, const u8 *buf, size_t len, u64 *cookie ); #else -int wlan_hdd_action( struct wiphy *wiphy, struct net_device *dev, +int wlan_hdd_mgmt_tx( struct wiphy *wiphy, struct net_device *dev, struct ieee80211_channel *chan, enum nl80211_channel_type channel_type, bool channel_type_valid, diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 07837f173784..93a83703c341 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -10421,7 +10421,7 @@ static struct cfg80211_ops wlan_hdd_cfg80211_ops = .get_tx_power = wlan_hdd_cfg80211_get_txpower, .remain_on_channel = wlan_hdd_cfg80211_remain_on_channel, .cancel_remain_on_channel = wlan_hdd_cfg80211_cancel_remain_on_channel, - .mgmt_tx = wlan_hdd_action, + .mgmt_tx = wlan_hdd_mgmt_tx, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) .mgmt_tx_cancel_wait = wlan_hdd_cfg80211_mgmt_tx_cancel_wait, .set_default_mgmt_key = wlan_hdd_set_default_mgmt_key, diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index 729e96bd69bb..8cd91838cf8a 100644 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -2179,7 +2179,7 @@ hdd_sendactionframe(hdd_adapter_t *pAdapter, const tANI_U8 *bssid, vos_mem_copy(hdr->addr3, bssid, VOS_MAC_ADDR_SIZE); vos_mem_copy(hdr + 1, payload, payload_len); - ret = wlan_hdd_action(NULL, + ret = wlan_hdd_mgmt_tx(NULL, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) &(pAdapter->wdev), #else diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c index b37a8f94a3c9..3ca30d5d7f22 100644 --- a/CORE/HDD/src/wlan_hdd_p2p.c +++ b/CORE/HDD/src/wlan_hdd_p2p.c @@ -781,7 +781,7 @@ int wlan_hdd_cfg80211_cancel_remain_on_channel( struct wiphy *wiphy, } #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) -int wlan_hdd_action( struct wiphy *wiphy, struct wireless_dev *wdev, +int wlan_hdd_mgmt_tx( struct wiphy *wiphy, struct wireless_dev *wdev, struct ieee80211_channel *chan, bool offchan, #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)) enum nl80211_channel_type channel_type, @@ -791,20 +791,20 @@ int wlan_hdd_action( struct wiphy *wiphy, struct wireless_dev *wdev, const u8 *buf, size_t len, bool no_cck, bool dont_wait_for_ack, u64 *cookie ) #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) -int wlan_hdd_action( struct wiphy *wiphy, struct net_device *dev, +int wlan_hdd_mgmt_tx( struct wiphy *wiphy, struct net_device *dev, struct ieee80211_channel *chan, bool offchan, enum nl80211_channel_type channel_type, bool channel_type_valid, unsigned int wait, const u8 *buf, size_t len, bool no_cck, bool dont_wait_for_ack, u64 *cookie ) #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) -int wlan_hdd_action( struct wiphy *wiphy, struct net_device *dev, +int wlan_hdd_mgmt_tx( struct wiphy *wiphy, struct net_device *dev, struct ieee80211_channel *chan, bool offchan, enum nl80211_channel_type channel_type, bool channel_type_valid, unsigned int wait, const u8 *buf, size_t len, u64 *cookie ) #else -int wlan_hdd_action( struct wiphy *wiphy, struct net_device *dev, +int wlan_hdd_mgmt_tx( struct wiphy *wiphy, struct net_device *dev, struct ieee80211_channel *chan, enum nl80211_channel_type channel_type, bool channel_type_valid, |
