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

Commit 6e85e0b7 authored by Holger Schurig's avatar Holger Schurig Committed by John W. Linville
Browse files

libertas: move lbs_send_iwevcustom_event() to wext.c 



... because it's purely a WEXT function.

No functional change.

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d0de3741

drivers/net/wireless/libertas/cmd.c

+0 −24
Original line number Diff line number Diff line
@@ -1542,30 +1542,6 @@ int lbs_execute_next_command(struct lbs_private *priv) 
	return ret;

}



void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str)

{

	union iwreq_data iwrq;

	u8 buf[50];



	lbs_deb_enter(LBS_DEB_WEXT);



	memset(&iwrq, 0, sizeof(union iwreq_data));

	memset(buf, 0, sizeof(buf));



	snprintf(buf, sizeof(buf) - 1, "%s", str);



	iwrq.data.length = strlen(buf) + 1 + IW_EV_LCP_LEN;



	/* Send Event to upper layer */

	lbs_deb_wext("event indication string %s\n", (char *)buf);

	lbs_deb_wext("event indication length %d\n", iwrq.data.length);

	lbs_deb_wext("sending wireless event IWEVCUSTOM for %s\n", str);



	wireless_send_event(priv->dev, IWEVCUSTOM, &iwrq, buf);



	lbs_deb_leave(LBS_DEB_WEXT);

}



static void lbs_send_confirmsleep(struct lbs_private *priv)

{

	unsigned long flags;

drivers/net/wireless/libertas/decl.h

+0 −2
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ struct chan_freq_power *lbs_find_cfp_by_band_and_channel( 
	u8 band,

	u16 channel);



void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str);



/* persistcfg.c */

void lbs_persist_config_init(struct net_device *net);

void lbs_persist_config_remove(struct net_device *net);

drivers/net/wireless/libertas/wext.c

+24 −0
Original line number Diff line number Diff line
@@ -45,6 +45,30 @@ static inline void lbs_cancel_association_work(struct lbs_private *priv) 
	priv->pending_assoc_req = NULL;

}



void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str)

{

	union iwreq_data iwrq;

	u8 buf[50];



	lbs_deb_enter(LBS_DEB_WEXT);



	memset(&iwrq, 0, sizeof(union iwreq_data));

	memset(buf, 0, sizeof(buf));



	snprintf(buf, sizeof(buf) - 1, "%s", str);



	iwrq.data.length = strlen(buf) + 1 + IW_EV_LCP_LEN;



	/* Send Event to upper layer */

	lbs_deb_wext("event indication string %s\n", (char *)buf);

	lbs_deb_wext("event indication length %d\n", iwrq.data.length);

	lbs_deb_wext("sending wireless event IWEVCUSTOM for %s\n", str);



	wireless_send_event(priv->dev, IWEVCUSTOM, &iwrq, buf);



	lbs_deb_leave(LBS_DEB_WEXT);

}



/**

 *  @brief Find the channel frequency power info with specific channel

 *

drivers/net/wireless/libertas/wext.h

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
#ifndef	_LBS_WEXT_H_

#define	_LBS_WEXT_H_



void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str);



extern struct iw_handler_def lbs_handler_def;

extern struct iw_handler_def mesh_handler_def;