diff options
| author | Ryan Hsu <ryanhsu@qca.qualcomm.com> | 2015-04-22 11:11:36 -0700 |
|---|---|---|
| committer | AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com> | 2015-05-04 23:39:25 +0530 |
| commit | 52be7e1f64ac37e95f70ddcebd86d6ed91c8b769 (patch) | |
| tree | 3dc4d86d36f8b5319e1576ea9a02fbe2a7f2060c | |
| parent | ddf10a499240bfb88ea86a6c74e4da0ea05bf68b (diff) | |
qcacld2.0: Update APIs - alloc_netdev and alloc_netdev_mq
Beginning from Kernel 3.17, a new parameter - name_type is added
to the following two APIs,
- alloc_netdev()
- alloc_netdev_mq()
Change-Id: I0426a4b1fb6555014de0a70e298571aeb8d84ed1
CRs-fixed: 827110
| -rw-r--r-- | CORE/EPPING/src/epping_txrx.c | 7 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_hostapd.c | 8 | ||||
| -rwxr-xr-x | CORE/HDD/src/wlan_hdd_main.c | 8 |
3 files changed, 20 insertions, 3 deletions
diff --git a/CORE/EPPING/src/epping_txrx.c b/CORE/EPPING/src/epping_txrx.c index 38f77b9b6db0..26f9a1406c03 100644 --- a/CORE/EPPING/src/epping_txrx.c +++ b/CORE/EPPING/src/epping_txrx.c @@ -355,7 +355,12 @@ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx, struct net_device *dev; epping_adapter_t *pAdapter; - dev = alloc_netdev(sizeof(epping_adapter_t), "wifi%d", ether_setup); + dev = alloc_netdev(sizeof(epping_adapter_t), + "wifi%d", +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) || defined(WITH_BACKPORTS) + NET_NAME_UNKNOWN, +#endif + ether_setup); if (dev == NULL) { EPPING_LOG(VOS_TRACE_LEVEL_FATAL, "%s: Cannot allocate epping_adapter_t\n", __func__); diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c index 6171a793b8b0..e02687c17e46 100644 --- a/CORE/HDD/src/wlan_hdd_hostapd.c +++ b/CORE/HDD/src/wlan_hdd_hostapd.c @@ -5994,7 +5994,13 @@ hdd_adapter_t* hdd_wlan_create_ap_dev( hdd_context_t *pHddCtx, tSirMacAddr macAd hddLog(VOS_TRACE_LEVEL_DEBUG, "%s: iface_name = %s", __func__, iface_name); - pWlanHostapdDev = alloc_netdev_mq(sizeof(hdd_adapter_t), iface_name, ether_setup, NUM_TX_QUEUES); + pWlanHostapdDev = alloc_netdev_mq(sizeof(hdd_adapter_t), + iface_name, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) || defined(WITH_BACKPORTS) + NET_NAME_UNKNOWN, +#endif + ether_setup, + NUM_TX_QUEUES); if (pWlanHostapdDev != NULL) { diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index 2f7fbf9f77a9..f22a7861523b 100755 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -7757,7 +7757,13 @@ static hdd_adapter_t* hdd_alloc_station_adapter( hdd_context_t *pHddCtx, tSirMac /* * cfg80211 initialization and registration.... */ - pWlanDev = alloc_netdev_mq(sizeof( hdd_adapter_t ), name, ether_setup, NUM_TX_QUEUES); + pWlanDev = alloc_netdev_mq(sizeof( hdd_adapter_t ), + name, +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) || defined(WITH_BACKPORTS) + NET_NAME_UNKNOWN, +#endif + ether_setup, + NUM_TX_QUEUES); if(pWlanDev != NULL) { |