diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 7a8e8ab..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm.h b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm.h
index 3d71179..dde731b 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm.h
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm.h
@@ -559,7 +559,7 @@ enum phy_reg_pg_type {
 	u8			support_platform;
 	/* ODM Platform info WIN/AP/CE = 1/2/3 */
 	u8			normal_rx_path;
-	/*ODM Support Ability DIG/RATR/TX_PWR_TRACK/ �K�K = 1/2/3/�K*/
+	/*ODM Support Ability DIG/RATR/TX_PWR_TRACK/ �K�K = 1/2/3/�K*/
 	u32			support_ability;
 	/*ODM PCIE/USB/SDIO = 1/2/3*/
 	u8			support_interface;
@@ -894,7 +894,7 @@ enum phy_reg_pg_type {
 	boolean			is_dm_initial_gain_enable;
 
 	/*MPT DIG*/
-	struct timer_list		mpt_dig_timer;
+	struct _timer_entry		mpt_dig_timer;
 
 	/*for rate adaptive, in fact,  88c/92c fw will handle this*/
 	u8			is_use_ra_mask;
@@ -931,14 +931,14 @@ enum phy_reg_pg_type {
 	u8			rx_pkt_type;
 
 	/*ODM relative time.*/
-	struct timer_list	path_div_switch_timer;
+	struct _timer_entry	path_div_switch_timer;
 	/*2011.09.27 add for path Diversity*/
-	struct timer_list	cck_path_diversity_timer;
-	struct timer_list	fast_ant_training_timer;
+	struct _timer_entry	cck_path_diversity_timer;
+	struct _timer_entry	fast_ant_training_timer;
 #ifdef ODM_EVM_ENHANCE_ANTDIV
-	struct timer_list			evm_fast_ant_training_timer;
+	struct _timer_entry			evm_fast_ant_training_timer;
 #endif
-	struct timer_list		sbdcnt_timer;
+	struct _timer_entry		sbdcnt_timer;
 
 	/*ODM relative workitem.*/
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_antdiv.c b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_antdiv.c
index 7d064d7..21be454 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_antdiv.c
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_antdiv.c
@@ -2858,7 +2858,7 @@ odm_s0s1_sw_ant_div(
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 void
 odm_sw_antdiv_callback(
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 )
 {
 	struct _ADAPTER		*adapter = (struct _ADAPTER *)p_timer->Adapter;
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_antdiv.h b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_antdiv.h
index dcb51e0..92b8289 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_antdiv.h
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_antdiv.h
@@ -149,7 +149,7 @@ struct _sw_antenna_switch_ {
 	u8		reset_idx;
 	u8		train_time;
 	u8		train_time_flag; /*base on RSSI difference between two antennas*/
-	struct timer_list	phydm_sw_antenna_switch_timer;
+	struct _timer_entry	phydm_sw_antenna_switch_timer;
 	u32		pkt_cnt_sw_ant_div_by_ctrl_frame;
 	boolean		is_sw_ant_div_by_ctrl_frame;
 
@@ -446,7 +446,7 @@ phydm_set_tx_ant_pwr_8723d(
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 void
 odm_sw_antdiv_callback(
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 );
 
 void
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_beamforming.c b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_beamforming.c
index 529e751..d576185 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_beamforming.c
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_beamforming.c
@@ -1186,7 +1186,7 @@ beamforming_init_entry(
 	if (beamform_cap & (BEAMFORMER_CAP_VHT_MU | BEAMFORMER_CAP_VHT_SU | BEAMFORMER_CAP_HT_EXPLICIT)) {
 		p_beamform_entry = phydm_beamforming_get_bfee_entry_by_addr(p_dm_odm, p_sta->ra, &bfee_idx);
 
-		/*�p�GBFeeIdx = 0xF �h�N���ثeentry�����S���ۦP��MACID�b��*/
+		/*�p�GBFeeIdx = 0xF �h�N��ثeentry���S���ۦP��MACID�b��*/
 		ODM_RT_TRACE(p_dm_odm, PHYDM_COMP_TXBF, ODM_DBG_LOUD, ("[%s] Get BFee entry 0x%X by address\n", __func__, bfee_idx));
 		if (p_beamform_entry == NULL) {
 			p_beamform_entry = beamforming_add_bfee_entry(p_dm_odm, p_sta, beamform_cap, num_of_sounding_dim, comp_steering_num_of_bfer, &bfee_idx);
@@ -1601,7 +1601,7 @@ beamforming_timer_callback(
 void
 beamforming_sw_timer_callback(
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 #elif (DM_ODM_SUPPORT_TYPE == ODM_CE)
 	void *function_context
 #endif
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_beamforming.h b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_beamforming.h
index 8a90938..9352d15 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_beamforming.h
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_beamforming.h
@@ -181,8 +181,8 @@ struct _RT_BEAMFORMING_INFO {
 	struct _RT_BEAMFORMER_ENTRY		beamformer_entry[BEAMFORMER_ENTRY_NUM];
 	struct _RT_BEAMFORM_STAINFO		beamform_sta_info;
 	u8					beamformee_cur_idx;
-	struct timer_list					beamforming_timer;
-	struct timer_list					mu_timer;
+	struct _timer_entry					beamforming_timer;
+	struct _timer_entry					mu_timer;
 	struct _RT_SOUNDING_INFO			sounding_info;
 	struct _RT_BEAMFORMING_OID_INFO	beamforming_oid_info;
 	struct _HAL_TXBF_INFO			txbf_info;
@@ -330,7 +330,7 @@ phydm_beamforming_watchdog(
 void
 beamforming_sw_timer_callback(
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 #elif (DM_ODM_SUPPORT_TYPE == ODM_CE)
 	void *function_context
 #endif
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_debug.c b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_debug.c
index 5f23ed0..9c91259 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_debug.c
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_debug.c
@@ -1011,7 +1011,7 @@ void phydm_sbd_check(
 #endif /*#if CONFIG_PHYDM_DEBUG_FUNCTION*/
 
 void phydm_sbd_callback(
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 )
 {
 #if CONFIG_PHYDM_DEBUG_FUNCTION
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_debug.h b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_debug.h
index 7fb69ab..b664c64 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_debug.h
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_debug.h
@@ -346,7 +346,7 @@ void phydm_sbd_check(
 );
 
 void phydm_sbd_callback(
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 );
 
 void phydm_sbd_workitem_callback(
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_dig.c b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_dig.c
index 6f9b2bd..cacee4a 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_dig.c
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_dig.c
@@ -2105,7 +2105,7 @@ odm_mpt_dig_work_item_callback(
 
 void
 odm_mpt_dig_callback(
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 )
 {
 	struct _ADAPTER		*adapter = (struct _ADAPTER *)p_timer->Adapter;
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_dig.h b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_dig.h
index 9ed736f..c3bf588 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_dig.h
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_dig.h
@@ -356,7 +356,7 @@ phydm_dig_go_up_check(
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 void
 odm_mpt_dig_callback(
-	struct timer_list						*p_timer
+	struct _timer_entry						*p_timer
 );
 
 void
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_dynamic_rx_path.c b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_dynamic_rx_path.c
index cbd831e..38b0084 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_dynamic_rx_path.c
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_dynamic_rx_path.c
@@ -188,7 +188,7 @@ phydm_dynamic_rx_path(
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 void
 phydm_dynamic_rx_path_callback(
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 )
 {
 	struct _ADAPTER		*adapter = (struct _ADAPTER *)p_timer->adapter;
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_dynamic_rx_path.h b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_dynamic_rx_path.h
index b38f63b..533d9be 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_dynamic_rx_path.h
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_dynamic_rx_path.h
@@ -70,7 +70,7 @@ struct _DYNAMIC_RX_PATH_ {
 	RT_WORK_ITEM	phydm_dynamic_rx_path_workitem;
 #endif
 #endif
-	struct timer_list		phydm_dynamic_rx_path_timer;
+	struct _timer_entry		phydm_dynamic_rx_path_timer;
 
 };
 
@@ -91,7 +91,7 @@ phydm_dynamic_rx_path(
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 void
 phydm_dynamic_rx_path_callback(
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 );
 
 void
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_interface.c b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_interface.c
index 9d67264..cb136c3 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_interface.c
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_interface.c
@@ -24,6 +24,8 @@
 
 #include "mp_precomp.h"
 #include "phydm_precomp.h"
+#include "osdep_service.h"
+#include "osdep_service_linux.h"
 
 /*
  * ODM IO Relative API.
@@ -557,7 +559,7 @@ ODM_sleep_us(u32	us)
 void
 odm_set_timer(
 	struct PHY_DM_STRUCT		*p_dm_odm,
-	struct timer_list		*p_timer,
+	struct _timer_entry		*p_timer,
 	u32			ms_delay
 )
 {
@@ -575,7 +577,7 @@ odm_set_timer(
 void
 odm_initialize_timer(
 	struct PHY_DM_STRUCT			*p_dm_odm,
-	struct timer_list			*p_timer,
+	struct _timer_entry			*p_timer,
 	void	*call_back_func,
 	void				*p_context,
 	const char			*sz_id
@@ -599,7 +601,7 @@ odm_initialize_timer(
 void
 odm_cancel_timer(
 	struct PHY_DM_STRUCT		*p_dm_odm,
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 )
 {
 #if (DM_ODM_SUPPORT_TYPE & ODM_AP)
@@ -616,7 +618,7 @@ odm_cancel_timer(
 void
 odm_release_timer(
 	struct PHY_DM_STRUCT		*p_dm_odm,
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 )
 {
 #if (DM_ODM_SUPPORT_TYPE & (ODM_AP))
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_interface.h b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_interface.h
index 79b8aad..7a22f82 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_interface.h
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_interface.h
@@ -22,6 +22,9 @@
 #ifndef	__ODM_INTERFACE_H__
 #define __ODM_INTERFACE_H__
 
+#include "osdep_service.h"
+#include "osdep_service_linux.h"
+
 #define INTERFACE_VERSION	"1.1"		/*2015.07.29  YuChen*/
 
 /*
@@ -339,14 +342,14 @@ ODM_sleep_us(u32	us);
 void
 odm_set_timer(
 	struct PHY_DM_STRUCT		*p_dm_odm,
-	struct timer_list		*p_timer,
+	struct _timer_entry		*p_timer,
 	u32			ms_delay
 );
 
 void
 odm_initialize_timer(
 	struct PHY_DM_STRUCT			*p_dm_odm,
-	struct timer_list			*p_timer,
+	struct _timer_entry			*p_timer,
 	void	*call_back_func,
 	void				*p_context,
 	const char			*sz_id
@@ -355,13 +358,13 @@ odm_initialize_timer(
 void
 odm_cancel_timer(
 	struct PHY_DM_STRUCT		*p_dm_odm,
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 );
 
 void
 odm_release_timer(
 	struct PHY_DM_STRUCT		*p_dm_odm,
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 );
 
 /*
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_pathdiv.c b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_pathdiv.c
index 91526ed..93a8e76 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_pathdiv.c
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_pathdiv.c
@@ -650,7 +650,7 @@ odm_path_diversity_init(
 
 void
 odm_path_div_chk_ant_switch_callback(
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 )
 {
 }
@@ -664,7 +664,7 @@ odm_path_div_chk_ant_switch_workitem_callback(
 
 void
 odm_cck_tx_path_diversity_callback(
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 )
 {
 }
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_pathdiv.h b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_pathdiv.h
index e21e10d..c13f52b 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_pathdiv.h
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/phydm_pathdiv.h
@@ -242,7 +242,7 @@ odm_reset_path_diversity_92c(
 
 void
 odm_cck_tx_path_diversity_callback(
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 );
 
 void
@@ -252,7 +252,7 @@ odm_cck_tx_path_diversity_work_item_callback(
 
 void
 odm_path_div_chk_ant_switch_callback(
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 );
 
 void
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/txbf/halcomtxbf.c b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/txbf/halcomtxbf.c
index 1536778..6e603a3 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/txbf/halcomtxbf.c
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/txbf/halcomtxbf.c
@@ -320,7 +320,7 @@ hal_com_txbf_rate_work_item_callback(
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 void
 hal_com_txbf_fw_ndpa_timer_callback(
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 )
 {
 
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/txbf/halcomtxbf.h b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/txbf/halcomtxbf.h
index 0ce056d..dfee813 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/txbf/halcomtxbf.h
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/hal/phydm/txbf/halcomtxbf.h
@@ -45,7 +45,7 @@ struct _HAL_TXBF_INFO {
 	u8				BW;
 	u8				rate;
 
-	struct timer_list			txbf_fw_ndpa_timer;
+	struct _timer_entry			txbf_fw_ndpa_timer;
 #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
 	RT_WORK_ITEM		txbf_enter_work_item;
 	RT_WORK_ITEM		txbf_leave_work_item;
@@ -136,7 +136,7 @@ hal_com_txbf_rate_work_item_callback(
 
 void
 hal_com_txbf_fw_ndpa_timer_callback(
-	struct timer_list		*p_timer
+	struct _timer_entry		*p_timer
 );
 
 void
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/include/Hal8814PhyCfg.h b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/include/Hal8814PhyCfg.h
index 9aaaf38..7e8352d 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/include/Hal8814PhyCfg.h
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/include/Hal8814PhyCfg.h
@@ -175,7 +175,7 @@ PHY_GetTxBBSwing_8814A(
 
 VOID
 PHY_SwChnlTimerCallback8814A(
-	IN	struct timer_list		*p_timer
+	IN	struct _timer_entry		*p_timer
 );
 
 VOID
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/include/osdep_service.h b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/include/osdep_service.h
index 4d7c1f0..55e9b7e 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/include/osdep_service.h
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/include/osdep_service.h
@@ -355,7 +355,7 @@ extern void rtw_init_timer(_timer *ptimer, void *padapter, void *pfunc);
 __inline static unsigned char _cancel_timer_ex(_timer *ptimer)
 {
 #ifdef PLATFORM_LINUX
-	return del_timer_sync(ptimer);
+	return del_timer_sync((struct timer_list *)ptimer);
 #endif
 #ifdef PLATFORM_FREEBSD
 	_cancel_timer(ptimer, 0);
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/include/osdep_service_linux.h b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/include/osdep_service_linux.h
index 43fa41f..ba94a0f 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/include/osdep_service_linux.h
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/include/osdep_service_linux.h
@@ -148,7 +148,14 @@ typedef	spinlock_t	_lock;
 #else
 	typedef struct semaphore	_mutex;
 #endif
-typedef struct timer_list _timer;
+// tjcw we need timer list to have a 'void *' as well
+struct _timer_entry {
+	struct timer_list t_list ;
+	void (*callback)(unsigned long) ;
+	unsigned long data ;
+} ;
+typedef struct _timer_entry _timer ;
+//typedef struct timer_list _timer;
 
 struct	__queue	{
 	struct	list_head	queue;
@@ -281,22 +288,30 @@ __inline static void rtw_list_delete(_list *plist)
 
 #define RTW_TIMER_HDL_ARGS void *FunctionContext
 
+// tjcw timer_list does not have 'data' any more. See what breaks without it.
+static void _timer_function(struct timer_list *ptimer)
+{
+	_timer *myptimer = (_timer *) ptimer ;
+	myptimer->callback(myptimer->data) ;
+}
 __inline static void _init_timer(_timer *ptimer, _nic_hdl nic_hdl, void *pfunc, void *cntx)
 {
 	/* setup_timer(ptimer, pfunc,(u32)cntx);	 */
-	ptimer->function = pfunc;
-	ptimer->data = (unsigned long)cntx;
-	init_timer(ptimer);
+//	ptimer->t_list.function = pfunc;
+	ptimer->callback=pfunc ;
+	ptimer->data = (unsigned long) cntx;
+//	init_timer((struct timer_list *)ptimer);
+	timer_setup(&(ptimer->t_list), _timer_function, 0);
 }
 
 __inline static void _set_timer(_timer *ptimer, u32 delay_time)
 {
-	mod_timer(ptimer , (jiffies + (delay_time * HZ / 1000)));
+	mod_timer(&(ptimer->t_list) , (jiffies + (delay_time * HZ / 1000)));
 }
 
 __inline static void _cancel_timer(_timer *ptimer, u8 *bcancelled)
 {
-	del_timer_sync(ptimer);
+	del_timer_sync(&(ptimer->t_list));
 	*bcancelled = 1;
 }
 
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/include/wifi.h b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/include/wifi.h
index 94338bf..cd0f56e 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/include/wifi.h
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/include/wifi.h
@@ -1016,7 +1016,7 @@ typedef enum _HT_CAP_AMPDU_DENSITY {
  * According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2)
  */
 #define IEEE80211_MIN_AMPDU_BUF 0x8
-#define IEEE80211_MAX_AMPDU_BUF 0x40
+#define IEEE80211_MAX_AMPDU_BUF 0x100
 
 
 /* Spatial Multiplexing Power Save Modes */
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/os_dep/linux/ioctl_cfg80211.c b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/os_dep/linux/ioctl_cfg80211.c
index 6d40a42..c6fbf96 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/os_dep/linux/ioctl_cfg80211.c
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/os_dep/linux/ioctl_cfg80211.c
@@ -737,24 +737,37 @@ check_bss:
 	if (rtw_to_roam(padapter) > 0) {
 		#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) || defined(COMPAT_KERNEL_RELEASE)
 		struct wiphy *wiphy = pwdev->wiphy;
+		struct cfg80211_roam_info roam_info = {} ;
 		struct ieee80211_channel *notify_channel;
 		u32 freq;
 		u16 channel = cur_network->network.Configuration.DSConfig;
 
 		freq = rtw_ch2freq(channel);
 		notify_channel = ieee80211_get_channel(wiphy, freq);
-		#endif
+		roam_info.channel = notify_channel;
+				roam_info.bssid = cur_network->network.MacAddress;
+				roam_info.req_ie =
+					pmlmepriv->assoc_req+sizeof(struct ieee80211_hdr_3addr)+2;
+				roam_info.req_ie_len =
+					pmlmepriv->assoc_req_len-sizeof(struct ieee80211_hdr_3addr)-2;
+				roam_info.resp_ie =
+					pmlmepriv->assoc_rsp+sizeof(struct ieee80211_hdr_3addr)+6;
+				roam_info.resp_ie_len =
+					pmlmepriv->assoc_rsp_len-sizeof(struct ieee80211_hdr_3addr)-6;
+				#endif
 
 		RTW_INFO(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter));
 		cfg80211_roamed(padapter->pnetdev
 			#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) || defined(COMPAT_KERNEL_RELEASE)
-			, notify_channel
-			#endif
+//			, notify_channel
+			, &roam_info
+            #else
 			, cur_network->network.MacAddress
 			, pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2
 			, pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2
 			, pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6
 			, pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6
+            #endif
 			, GFP_ATOMIC);
 #ifdef CONFIG_RTW_80211R
 		if ((rtw_to_roam(padapter) > 0) && rtw_chk_ft_flags(padapter, RTW_FT_SUPPORTED))
@@ -1739,7 +1752,8 @@ enum nl80211_iftype {
 #endif
 static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
 				     struct net_device *ndev,
-				     enum nl80211_iftype type, u32 *flags,
+				     enum nl80211_iftype type,
+//					 u32 *flags,
 				     struct vif_params *params)
 {
 	enum nl80211_iftype old_type;
@@ -3818,7 +3832,7 @@ static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name, struct ne
 	mon_ndev->type = ARPHRD_IEEE80211_RADIOTAP;
 	strncpy(mon_ndev->name, name, IFNAMSIZ);
 	mon_ndev->name[IFNAMSIZ - 1] = 0;
-	mon_ndev->destructor = rtw_ndev_destructor;
+	mon_ndev->priv_destructor = rtw_ndev_destructor;
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29))
 	mon_ndev->netdev_ops = &rtw_cfg80211_monitor_if_ops;
@@ -3884,7 +3898,9 @@ static int
 		#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
 		unsigned char name_assign_type,
 		#endif
-		enum nl80211_iftype type, u32 *flags, struct vif_params *params)
+		enum nl80211_iftype type,
+//		u32 *flags,
+		struct vif_params *params)
 {
 	int ret = 0;
 	struct wireless_dev *wdev = NULL;
@@ -6762,7 +6778,7 @@ static void rtw_cfg80211_preinit_wiphy(_adapter *adapter, struct wiphy *wiphy)
 #endif
 
 #if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0))
-	wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
+//	wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
 #ifdef CONFIG_PNO_SUPPORT
 	wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT;
 #endif
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/os_dep/linux/os_intfs.c b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/os_dep/linux/os_intfs.c
index ecabfd3..e37b717 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/os_dep/linux/os_intfs.c
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/os_dep/linux/os_intfs.c
@@ -1167,7 +1167,8 @@ unsigned int rtw_classify8021d(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
+//	, void *accel_priv
+		,struct net_device *sb_dev
 	#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
 	, select_queue_fallback_t fallback
 	#endif
diff --git a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/os_dep/osdep_service.c b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/os_dep/osdep_service.c
index 1fbea5d..927e00c 100644
--- a/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/os_dep/osdep_service.c
+++ b/Linux/driver/rtl8821AU_WiFi_linux_v5.2.6.2_23547.20170814_COEX20170206-6760/os_dep/osdep_service.c
@@ -1988,7 +1988,7 @@ static int readFile(struct file *fp, char *buf, int len)
 
 	while (sum < len) {
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
-		rlen = __vfs_read(fp, buf + sum, len - sum, &fp->f_pos);
+		rlen = kernel_read(fp, buf + sum, len - sum, &fp->f_pos);
 #else
 		rlen = fp->f_op->read(fp, buf + sum, len - sum, &fp->f_pos);
 #endif
diff --git a/README.md b/README.md
index ac2d8c8..0dbe5d9 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # RTL8811AU
 
-This is the driver for a RealTek WiFi adapter, for OpenSuSE Leap 15.0 Linux. You should be using the leap-15.0 branch, so type 'git checkout leap-15.0' before proceeding.
+This is the driver for a RealTek WiFi adapter, for OpenSuSE Leap 15.0 Linux.
 
 To build this driver, first install the kernel-devel software package through YAST; then go to the Linux/driver/rtl* directory and type 'make'.
 
-To install the driver, in the same directory type 'sudo make install'.
+To install the driver, in the same directory type 'sudo make install'.
\ No newline at end of file
