---

yaml --- r: 220295 b: refs/heads/master c: 97eea3a h: refs/heads/master i: 220293: c636b9a 220291: be47bbc 220287: 57703bb v: v3
git-mirror · Oct 12, 2010 · ec65341 · ec65341
1 parent 7cbad99
commit ec65341
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba07d0cbc919613ce48acc0a43d6e8ab35cd7748
+refs/heads/master: 97eea3afa2b10900c2373458eb4f0341357e8bf8
diff --git a/trunk/drivers/staging/rt2860/common/ba_action.c b/trunk/drivers/staging/rt2860/common/ba_action.c
@@ -26,6 +26,7 @@
  */
 
 #include "../rt_config.h"
+#include <linux/kernel.h>
 
 #define BA_ORI_INIT_SEQ		(pEntry->TxSeq[TID])	/*1                        // inital sequence number of BA session */
 

diff --git a/trunk/drivers/staging/rt2860/common/mlme.c b/trunk/drivers/staging/rt2860/common/mlme.c
@@ -38,6 +38,7 @@
 
 #include "../rt_config.h"
 #include <stdarg.h>
+#include <linux/kernel.h>
 
 u8 CISCO_OUI[] = { 0x00, 0x40, 0x96 };
 

diff --git a/trunk/drivers/staging/rt2860/rtmp.h b/trunk/drivers/staging/rt2860/rtmp.h
@@ -324,14 +324,6 @@ struct rt_rtmp_sg_list {
 /* */
 /*  Some utility macros */
 /* */
-#ifndef min
-#define min(_a, _b)     (((_a) < (_b)) ? (_a) : (_b))
-#endif
-
-#ifndef max
-#define max(_a, _b)     (((_a) > (_b)) ? (_a) : (_b))
-#endif
-
 #define GET_LNA_GAIN(_pAd)	((_pAd->LatchRfRegs.Channel <= 14) ? (_pAd->BLNAGain) : ((_pAd->LatchRfRegs.Channel <= 64) ? (_pAd->ALNAGain0) : ((_pAd->LatchRfRegs.Channel <= 128) ? (_pAd->ALNAGain1) : (_pAd->ALNAGain2))))
 
 #define INC_COUNTER64(Val)          (Val.QuadPart++)

diff --git a/trunk/drivers/staging/rt2860/sta/rtmp_data.c b/trunk/drivers/staging/rt2860/sta/rtmp_data.c
@@ -35,6 +35,7 @@
 	--------	----------		----------------------------------------------
 */
 #include "../rt_config.h"
+#include <linux/kernel.h>
 
 void STARxEAPOLFrameIndicate(struct rt_rtmp_adapter *pAd,
 			     struct rt_mac_table_entry *pEntry,
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ @@
      */
     #include "../rt_config.h"
+    #include <linux/kernel.h>
     #define BA_ORI_INIT_SEQ		(pEntry->TxSeq[TID])	/*1                        // inital sequence number of BA session */
@@ Expand Down @@