--- ./driver/rtl8192EU_linux_v4.2.2_7585.20130524/os_dep/linux/os_intfs.c 2013-05-24 08:51:26.000000000 +0200 +++ ./driver/rtl8192EU_linux_v4.2.2_7585.20130524/os_dep/linux/os_intfs.c 2014-10-18 17:46:29.056523999 +0200 @@ -352,14 +352,21 @@ #if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) rtw_proc=create_proc_entry(rtw_proc_name, S_IFDIR, proc_net); #else +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) rtw_proc=create_proc_entry(rtw_proc_name, S_IFDIR, init_net.proc_net); +#else + rtw_proc=proc_mkdir(rtw_proc_name, init_net.proc_net); +#endif #endif if (rtw_proc == NULL) { DBG_871X(KERN_ERR "Unable to create rtw_proc directory\n"); return; } - +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("ver_info", S_IFREG | S_IRUGO, rtw_proc, proc_get_drv_version, dev); +#else + entry = proc_create_data("ver_info", S_IFREG | S_IRUGO, rtw_proc, proc_get_drv_version, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; @@ -370,10 +377,15 @@ if(padapter->dir_dev == NULL) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) padapter->dir_dev = create_proc_entry(dev->name, S_IFDIR | S_IRUGO | S_IXUGO, rtw_proc); +#else + padapter->dir_dev = proc_mkdir(dev->name,rtw_proc); +#endif + dir_dev = padapter->dir_dev; if(dir_dev==NULL) @@ -401,140 +413,230 @@ rtw_proc_cnt++; +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("write_reg", S_IFREG | S_IRUGO, dir_dev, proc_get_write_reg, dev); +#else + entry = proc_create_data("write_reg", S_IFREG | S_IRUGO, + dir_dev, proc_get_write_reg, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry->write_proc = proc_set_write_reg; entry = create_proc_read_entry("read_reg", S_IFREG | S_IRUGO, dir_dev, proc_get_read_reg, dev); +#else + entry = proc_create_data("read_reg", S_IFREG | S_IRUGO, + dir_dev, proc_get_read_reg, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry->write_proc = proc_set_read_reg; - entry = create_proc_read_entry("fwstate", S_IFREG | S_IRUGO, dir_dev, proc_get_fwstate, dev); +#else + entry = proc_create_data("fwstate", S_IFREG | S_IRUGO, + dir_dev, proc_get_fwstate, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } - +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("sec_info", S_IFREG | S_IRUGO, dir_dev, proc_get_sec_info, dev); +#else + entry = proc_create_data("sec_info", S_IFREG | S_IRUGO, + dir_dev, proc_get_sec_info, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } - +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("mlmext_state", S_IFREG | S_IRUGO, dir_dev, proc_get_mlmext_state, dev); +#else + entry = proc_create_data("mlmext_state", S_IFREG | S_IRUGO, + dir_dev, proc_get_mlmext_state, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } - +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("qos_option", S_IFREG | S_IRUGO, dir_dev, proc_get_qos_option, dev); +#else + entry = proc_create_data("qos_option", S_IFREG | S_IRUGO, + dir_dev, proc_get_qos_option, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("ht_option", S_IFREG | S_IRUGO, dir_dev, proc_get_ht_option, dev); +#else + entry = proc_create_data("ht_option", S_IFREG | S_IRUGO, + dir_dev, proc_get_ht_option, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("rf_info", S_IFREG | S_IRUGO, dir_dev, proc_get_rf_info, dev); +#else + entry = proc_create_data("rf_info", S_IFREG | S_IRUGO, + dir_dev, proc_get_rf_info, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("ap_info", S_IFREG | S_IRUGO, dir_dev, proc_get_ap_info, dev); +#else + entry = proc_create_data("ap_info", S_IFREG | S_IRUGO, + dir_dev, proc_get_ap_info, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("adapter_state", S_IFREG | S_IRUGO, dir_dev, proc_get_adapter_state, dev); +#else + entry = proc_create_data("adapter_state", S_IFREG | S_IRUGO, + dir_dev, proc_get_adapter_state, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("trx_info", S_IFREG | S_IRUGO, dir_dev, proc_get_trx_info, dev); +#else + entry = proc_create_data("trx_info", S_IFREG | S_IRUGO, + dir_dev, proc_get_trx_info, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } - +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("mac_reg_dump1", S_IFREG | S_IRUGO, dir_dev, proc_get_mac_reg_dump1, dev); +#else + entry = proc_create_data("mac_reg_dump1", S_IFREG | S_IRUGO, + dir_dev, proc_get_mac_reg_dump1, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("mac_reg_dump2", S_IFREG | S_IRUGO, dir_dev, proc_get_mac_reg_dump2, dev); +#else + entry = proc_create_data("mac_reg_dump2", S_IFREG | S_IRUGO, + dir_dev, proc_get_mac_reg_dump2, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("mac_reg_dump3", S_IFREG | S_IRUGO, dir_dev, proc_get_mac_reg_dump3, dev); +#else + entry = proc_create_data("mac_reg_dump3", S_IFREG | S_IRUGO, + dir_dev, proc_get_mac_reg_dump3, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("bb_reg_dump1", S_IFREG | S_IRUGO, dir_dev, proc_get_bb_reg_dump1, dev); +#else + entry = proc_create_data("bb_reg_dump1", S_IFREG | S_IRUGO, + dir_dev, proc_get_bb_reg_dump1, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("bb_reg_dump2", S_IFREG | S_IRUGO, dir_dev, proc_get_bb_reg_dump2, dev); +#else + entry = proc_create_data("bb_reg_dump2", S_IFREG | S_IRUGO, + dir_dev, proc_get_bb_reg_dump2, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("bb_reg_dump3", S_IFREG | S_IRUGO, dir_dev, proc_get_bb_reg_dump3, dev); +#else + entry = proc_create_data("bb_reg_dump3", S_IFREG | S_IRUGO, + dir_dev, proc_get_bb_reg_dump3, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("rf_reg_dump1", S_IFREG | S_IRUGO, dir_dev, proc_get_rf_reg_dump1, dev); +#else + entry = proc_create_data("rf_reg_dump1", S_IFREG | S_IRUGO, + dir_dev, proc_get_rf_reg_dump1, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("rf_reg_dump2", S_IFREG | S_IRUGO, dir_dev, proc_get_rf_reg_dump2, dev); +#else + entry = proc_create_data("rf_reg_dump2", S_IFREG | S_IRUGO, + dir_dev, proc_get_rf_reg_dump2, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; @@ -542,15 +644,25 @@ rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type)); if((RF_1T2R == rf_type) ||(RF_1T1R ==rf_type )) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("rf_reg_dump3", S_IFREG | S_IRUGO, dir_dev, proc_get_rf_reg_dump3, dev); +#else + entry = proc_create_data("rf_reg_dump3", S_IFREG | S_IRUGO, + dir_dev, proc_get_rf_reg_dump3, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("rf_reg_dump4", S_IFREG | S_IRUGO, dir_dev, proc_get_rf_reg_dump4, dev); +#else + entry = proc_create_data("rf_reg_dump4", S_IFREG | S_IRUGO, + dir_dev, proc_get_rf_reg_dump4, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; @@ -558,9 +670,13 @@ } #ifdef CONFIG_AP_MODE - +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("all_sta_info", S_IFREG | S_IRUGO, dir_dev, proc_get_all_sta_info, dev); +#else + entry = proc_create_data("all_sta_info", S_IFREG | S_IRUGO, + dir_dev, proc_get_all_sta_info, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; @@ -568,8 +684,13 @@ #endif #ifdef DBG_MEMORY_LEAK +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("_malloc_cnt", S_IFREG | S_IRUGO, dir_dev, proc_get_malloc_cnt, dev); +#else + entry = proc_create_data("_malloc_cnt", S_IFREG | S_IRUGO, + dir_dev, proc_get_malloc_cnt, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; @@ -577,83 +698,143 @@ #endif #ifdef CONFIG_FIND_BEST_CHANNEL +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("best_channel", S_IFREG | S_IRUGO, dir_dev, proc_get_best_channel, dev); +#else + entry = proc_create_data("best_channel", S_IFREG | S_IRUGO, + dir_dev, proc_get_best_channel, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } #endif - +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("rx_signal", S_IFREG | S_IRUGO, dir_dev, proc_get_rx_signal, dev); +#else + entry = proc_create_data("rx_signal", S_IFREG | S_IRUGO, + dir_dev, proc_get_rx_signal, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry->write_proc = proc_set_rx_signal; +#endif #ifdef CONFIG_80211N_HT +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("ht_enable", S_IFREG | S_IRUGO, dir_dev, proc_get_ht_enable, dev); +#else + entry = proc_create_data("ht_enable", S_IFREG | S_IRUGO, + dir_dev, proc_get_ht_enable, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry->write_proc = proc_set_ht_enable; - +#endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("bw_mode", S_IFREG | S_IRUGO, dir_dev, proc_get_bw_mode, dev); +#else + entry = proc_create_data("bw_mode", S_IFREG | S_IRUGO, + dir_dev, proc_get_bw_mode, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry->write_proc = proc_set_bw_mode; - +#endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("ampdu_enable", S_IFREG | S_IRUGO, dir_dev, proc_get_ampdu_enable, dev); +#else + entry = proc_create_data("ampdu_enable", S_IFREG | S_IRUGO, + dir_dev, proc_get_ampdu_enable, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry->write_proc = proc_set_ampdu_enable; - +#endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("rx_stbc", S_IFREG | S_IRUGO, dir_dev, proc_get_rx_stbc, dev); +#else + entry = proc_create_data("rx_stbc", S_IFREG | S_IRUGO, + dir_dev, proc_get_rx_stbc, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry->write_proc = proc_set_rx_stbc; +#endif #endif //CONFIG_80211N_HT - +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("path_rssi", S_IFREG | S_IRUGO, dir_dev, proc_get_two_path_rssi, dev); - +#else + entry = proc_create_data("path_rssi", S_IFREG | S_IRUGO, + dir_dev, proc_get_two_path_rssi, dev); +#endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("rssi_disp", S_IFREG | S_IRUGO, dir_dev, proc_get_rssi_disp, dev); +#else + entry = proc_create_data("rssi_disp", S_IFREG | S_IRUGO, + dir_dev, proc_get_rssi_disp, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry->write_proc = proc_set_rssi_disp; +#endif #ifdef CONFIG_BT_COEXIST +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("btcoex_dbg", S_IFREG | S_IRUGO, dir_dev, proc_get_btcoex_dbg, dev); +#else + entry = proc_create_data("btcoex_dbg", S_IFREG | S_IRUGO, + dir_dev, proc_get_btcoex_dbg, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry->write_proc = proc_set_btcoex_dbg; +#endif #endif /*CONFIG_BT_COEXIST*/ #if defined(DBG_CONFIG_ERROR_DETECT) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry = create_proc_read_entry("sreset", S_IFREG | S_IRUGO, dir_dev, proc_get_sreset, dev); +#else + entry = proc_create_data("sreset", S_IFREG | S_IRUGO, + dir_dev, proc_get_sreset, dev); +#endif if (!entry) { DBG_871X("Unable to create_proc_read_entry!\n"); return; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) entry->write_proc = proc_set_sreset; +#endif #endif /* DBG_CONFIG_ERROR_DETECT */ }