Skip to content

Commit

Permalink
Staging: w35und: unify mto.h and mto_f.h header files
Browse files Browse the repository at this point in the history
No need to keep function definitions separate from the rest so unify mto.h and
mto_f.h header files.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Pekka Enberg authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 91da3d3 commit 64328c8
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 16 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/winbond/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <linux/wireless.h>

#include "bssdscpt.h"
#include "mto.h"
#include "wbhal_s.h"
#include "mto.h"

#define WBLINUX_PACKET_ARRAY_SIZE (ETHERNET_TX_DESCRIPTORS*4)

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/winbond/mds.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "gl_80211.h"
#include "mds_f.h"
#include "mlmetxrx_f.h"
#include "mto_f.h"
#include "mto.h"
#include "sysdef.h"
#include "wbhal_f.h"
#include "wblinux_f.h"
Expand Down
9 changes: 9 additions & 0 deletions drivers/staging/winbond/mto.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

#include <linux/types.h>

struct wbsoft_priv;

#define MTO_DEFAULT_TH_CNT 5
#define MTO_DEFAULT_TH_SQ3 112 //OLD IS 13 reference JohnXu
#define MTO_DEFAULT_TH_IDLE_SLOT 15
Expand Down Expand Up @@ -259,6 +261,13 @@ typedef struct _STATISTICS_INFO {
s32 Antenna;
} STATISTICS_INFO, *PSTATISTICS_INFO;

extern void MTO_Init(struct wbsoft_priv *);
extern void MTO_PeriodicTimerExpired(struct wbsoft_priv *);
extern void MTO_SetDTORateRange(struct wbsoft_priv *, u8 *, u8);
extern u8 MTO_GetTxRate(MTO_FUNC_INPUT, u32 fpdu_len);
extern u8 MTO_GetTxFallbackRate(MTO_FUNC_INPUT);
extern void MTO_SetTxCount(MTO_FUNC_INPUT, u8 t0, u8 index);

#endif //__MTO_H__


13 changes: 0 additions & 13 deletions drivers/staging/winbond/mto_f.h

This file was deleted.

2 changes: 1 addition & 1 deletion drivers/staging/winbond/wbusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "core.h"
#include "mds_f.h"
#include "mlmetxrx_f.h"
#include "mto_f.h"
#include "mto.h"
#include "wbhal_f.h"
#include "wblinux_f.h"

Expand Down

0 comments on commit 64328c8

Please sign in to comment.