Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64328c87 authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

Staging: w35und: unify mto.h and mto_f.h header files 



No need to keep function definitions separate from the rest so unify mto.h and
mto_f.h header files.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Acked-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 91da3d33

drivers/staging/winbond/core.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/staging/winbond/mds.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

drivers/staging/winbond/mto.h

+9 −0
Original line number Diff line number Diff line
@@ -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
@@ -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__

drivers/staging/winbond/mto_f.h

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
#ifndef __WINBOND_MTO_F_H

#define __WINBOND_MTO_F_H



#include "core.h"



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

drivers/staging/winbond/wbusb.c

+1 −1
Original line number Diff line number Diff line
@@ -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"