[adm5120] integrate 2.6.28 specific patch into the usb driver

[openwrt.git] / package / libertas / src / defs.h

diff --git a/package/libertas/src/defs.h b/package/libertas/src/defs.h
index 3053cc2..db9cc21 100644 (file)
--- a/package/libertas/src/defs.h
+++ b/package/libertas/src/defs.h
@@ -53,14 +53,14 @@ do { if ((lbs_debug & (grp)) == (grp)) \
 #endif
 
 #define lbs_deb_enter(grp) \
 #endif
 
 #define lbs_deb_enter(grp) \

-  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s():%d\n", __FUNCTION__, __LINE__);
+  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s()\n", __func__);

 #define lbs_deb_enter_args(grp, fmt, args...) \
 #define lbs_deb_enter_args(grp, fmt, args...) \

-  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s(" fmt "):%d\n", __FUNCTION__, ## args, __LINE__);
+  LBS_DEB_LL(grp | LBS_DEB_ENTER, " enter", "%s(" fmt ")\n", __func__, ## args);

 #define lbs_deb_leave(grp) \
 #define lbs_deb_leave(grp) \

-  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s():%d\n", __FUNCTION__, __LINE__);
+  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s()\n", __func__);

 #define lbs_deb_leave_args(grp, fmt, args...) \
 #define lbs_deb_leave_args(grp, fmt, args...) \

-  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s():%d, " fmt "\n", \
-  __FUNCTION__, __LINE__, ##args);
+  LBS_DEB_LL(grp | LBS_DEB_LEAVE, " leave", "%s(), " fmt "\n", \
+  __func__, ##args);

 #define lbs_deb_main(fmt, args...)      LBS_DEB_LL(LBS_DEB_MAIN, " main", fmt, ##args)
 #define lbs_deb_net(fmt, args...)       LBS_DEB_LL(LBS_DEB_NET, " net", fmt, ##args)
 #define lbs_deb_mesh(fmt, args...)      LBS_DEB_LL(LBS_DEB_MESH, " mesh", fmt, ##args)
 #define lbs_deb_main(fmt, args...)      LBS_DEB_LL(LBS_DEB_MAIN, " main", fmt, ##args)
 #define lbs_deb_net(fmt, args...)       LBS_DEB_LL(LBS_DEB_NET, " net", fmt, ##args)
 #define lbs_deb_mesh(fmt, args...)      LBS_DEB_LL(LBS_DEB_MESH, " mesh", fmt, ##args)


@@ -165,7 +165,7 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in
 #define        MRVDRV_MAX_CHANNELS_PER_SCAN            14
 
 #define MRVDRV_MIN_BEACON_INTERVAL             20
 #define        MRVDRV_MAX_CHANNELS_PER_SCAN            14
 
 #define MRVDRV_MIN_BEACON_INTERVAL             20

-#define MRVDRV_MAX_BEACON_INTERVAL             1000
+#define MRVDRV_MAX_BEACON_INTERVAL             10000

 #define MRVDRV_BEACON_INTERVAL                 100
 
 #define MARVELL_MESH_IE_LENGTH         9
 #define MRVDRV_BEACON_INTERVAL                 100
 
 #define MARVELL_MESH_IE_LENGTH         9


@@ -177,8 +177,6 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in
 #define MRVDRV_CMD_UPLD_RDY            0x0008
 #define MRVDRV_CARDEVENT               0x0010
 
 #define MRVDRV_CMD_UPLD_RDY            0x0008
 #define MRVDRV_CARDEVENT               0x0010
 

-#define SBI_EVENT_CAUSE_SHIFT          3
-

 /** TxPD status */
 
 /*     Station firmware use TxPD status field to report final Tx transmit
 /** TxPD status */
 
 /*     Station firmware use TxPD status field to report final Tx transmit