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

Commit 697900ac authored by Holger Schurig's avatar Holger Schurig Committed by John W. Linville
Browse files

libertas: move association code from join.c into scan.c 



Besides code moving, I did the following changes:

* made some functions static
* removed some unneeded #include's
* made patch checkpatch.pl clean

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 53f36d70

drivers/net/wireless/libertas/Makefile

+1 −1
Original line number Diff line number Diff line 
libertas-objs := main.o wext.o \

		rx.o tx.o cmd.o 	  \

		cmdresp.o scan.o	  \

		join.o 11d.o 		  \

		11d.o 		  \

		debugfs.o	  \

		ethtool.o assoc.o

drivers/net/wireless/libertas/assoc.c

+858 −4

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/libertas/assoc.h

+28 −0
Original line number Diff line number Diff line
@@ -8,4 +8,32 @@ 
void lbs_association_worker(struct work_struct *work);

struct assoc_request *lbs_get_association_request(struct lbs_private *priv);



struct cmd_ds_command;

int lbs_cmd_80211_authenticate(struct lbs_private *priv,

					struct cmd_ds_command *cmd,

					void *pdata_buf);

int lbs_cmd_80211_ad_hoc_join(struct lbs_private *priv,

				       struct cmd_ds_command *cmd,

				       void *pdata_buf);

int lbs_cmd_80211_ad_hoc_stop(struct cmd_ds_command *cmd);

int lbs_cmd_80211_ad_hoc_start(struct lbs_private *priv,

					struct cmd_ds_command *cmd,

					void *pdata_buf);

int lbs_cmd_80211_deauthenticate(struct lbs_private *priv,

					  struct cmd_ds_command *cmd);

int lbs_cmd_80211_associate(struct lbs_private *priv,

				     struct cmd_ds_command *cmd,

				     void *pdata_buf);



int lbs_ret_80211_ad_hoc_start(struct lbs_private *priv,

					struct cmd_ds_command *resp);

int lbs_ret_80211_ad_hoc_stop(struct lbs_private *priv);

int lbs_ret_80211_disassociate(struct lbs_private *priv);

int lbs_ret_80211_associate(struct lbs_private *priv,

				     struct cmd_ds_command *resp);



int lbs_stop_adhoc_network(struct lbs_private *priv);



int lbs_send_deauthentication(struct lbs_private *priv);



#endif /* _LBS_ASSOC_H */

drivers/net/wireless/libertas/cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include "decl.h"

#include "defs.h"

#include "dev.h"

#include "join.h"

#include "assoc.h"

#include "wext.h"

#include "cmd.h"

drivers/net/wireless/libertas/cmdresp.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include "decl.h"

#include "defs.h"

#include "dev.h"

#include "join.h"

#include "assoc.h"

#include "wext.h"



/**