--- ./Makefile.ori 2014-05-05 12:28:48.000000000 +0200 +++ ./Makefile 2015-05-22 17:50:38.000000000 +0200 @@ -13,7 +13,7 @@ EXTRA_CFLAGS += -Wno-unused-parameter EXTRA_CFLAGS += -Wno-unused-function EXTRA_CFLAGS += -Wno-unused - +EXTRA_CFLAGS += -Wno-date-time #EXTRA_CFLAGS += -Wno-uninitialized EXTRA_CFLAGS += -I$(src)/include --- ./include/osdep_intf_old.h 2014-05-05 10:28:36.000000000 +0200 +++ ./include/osdep_intf.h 2014-10-31 22:09:37.485610833 +0100 @@ -116,8 +116,10 @@ u16 rtw_recv_select_queue(struct sk_buff *skb); #endif //LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35) +#if (LINUX_VERSION_CODE<KERNEL_VERSION(3, 11, 0)) int rtw_ndev_notifier_register(void); void rtw_ndev_notifier_unregister(void); +#endif #include "../os_dep/linux/rtw_proc.h" #endif //PLATFORM_LINUX --- ./os_dep/linux/os_intfs_old.c 2014-05-05 10:28:41.000000000 +0200 +++ ./os_dep/linux/os_intfs.c 2014-11-01 08:52:31.237587910 +0100 @@ -601,7 +601,14 @@ return dscp >> 5; } -static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb) +static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb +#if (LINUX_VERSION_CODE>=KERNEL_VERSION(3, 13, 0)) + ,void *accel_priv +#endif +#if (LINUX_VERSION_CODE>=KERNEL_VERSION(3, 14, 0)) + ,select_queue_fallback_t fallback +#endif +) { _adapter *padapter = rtw_netdev_priv(dev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -643,9 +650,9 @@ return rtw_1d_to_queue[priority]; } - #endif +#if (LINUX_VERSION_CODE<KERNEL_VERSION(3, 11, 0)) static int rtw_ndev_notifier_call(struct notifier_block * nb, unsigned long state, void *ndev) { struct net_device *dev = ndev; @@ -681,7 +688,7 @@ { unregister_netdevice_notifier(&rtw_ndev_notifier); } - +#endif int rtw_ndev_init(struct net_device *dev) { @@ -767,6 +767,10 @@ return 0; } +static const struct device_type wlan_type = { + .name = "wlan", +}; + struct net_device *rtw_init_netdev(_adapter *old_padapter) { _adapter *padapter; @@ -782,6 +786,7 @@ if (!pnetdev) return NULL; + pnetdev->dev.type = &wlan_type; padapter = rtw_netdev_priv(pnetdev); padapter->pnetdev = pnetdev; --- ./os_dep/linux/rtw_android_old.c 2014-05-05 10:28:41.000000000 +0200 +++ ./os_dep/linux/rtw_android.c 2014-10-31 21:46:16.360988547 +0100 @@ -763,7 +763,7 @@ { #ifdef CONFIG_LPS u8 dtim; - u8 *ptr = priv_cmd.buf; + u8 *ptr = (u8 *) &priv_cmd.buf; ptr += 9;//string command length of "SET_DTIM"; --- ./os_dep/linux/rtw_proc_old.c 2014-05-05 10:28:41.000000000 +0200 +++ ./os_dep/linux/rtw_proc.c 2014-10-31 21:47:05.471146392 +0100 @@ -319,7 +319,7 @@ } -int proc_reset_rx_info(struct file *file, const char __user *buffer, size_t count, loff_t *pos, void *data) +ssize_t proc_reset_rx_info(struct file *file, const char __user *buffer, size_t count, loff_t *pos, void *data) { struct net_device *dev = data; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); --- ./os_dep/linux/usb_intf_old.c 2014-05-05 10:28:41.000000000 +0200 +++ ./os_dep/linux/usb_intf.c 2014-10-31 22:20:50.721906189 +0100 @@ -1902,15 +1902,18 @@ usb_drv.drv_registered = _TRUE; rtw_suspend_lock_init(); rtw_drv_proc_init(); +#if (LINUX_VERSION_CODE<KERNEL_VERSION(3, 11, 0)) rtw_ndev_notifier_register(); - +#endif ret = usb_register(&usb_drv.usbdrv); if (ret != 0) { usb_drv.drv_registered = _FALSE; rtw_suspend_lock_uninit(); rtw_drv_proc_deinit(); +#if (LINUX_VERSION_CODE<KERNEL_VERSION(3, 11, 0)) rtw_ndev_notifier_unregister(); +#endif goto exit; } @@ -1931,7 +1934,9 @@ rtw_suspend_lock_uninit(); rtw_drv_proc_deinit(); +#if (LINUX_VERSION_CODE<KERNEL_VERSION(3, 11, 0)) rtw_ndev_notifier_unregister(); +#endif DBG_871X_LEVEL(_drv_always_, "module exit success\n");