diff options
author | Holger Schurig <hs4233@mail.mn-solutions.de> | 2009-10-22 09:30:52 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-27 16:48:38 -0400 |
commit | 6e85e0b7ab1cafd6ff63c391d231b5a39934802e (patch) | |
tree | b69c9f24114220c97cb61aaaede2c6b424792f75 /drivers/net | |
parent | d0de37417e51219d7d56a452d18fa7b829342fcc (diff) |
libertas: move lbs_send_iwevcustom_event() to wext.c
... because it's purely a WEXT function.
No functional change.
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/libertas/cmd.c | 24 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/decl.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/wext.c | 24 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/wext.h | 2 |
4 files changed, 26 insertions, 26 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c index d1cfcd25a506..7ddab10f0bd5 100644 --- a/drivers/net/wireless/libertas/cmd.c +++ b/drivers/net/wireless/libertas/cmd.c | |||
@@ -1542,30 +1542,6 @@ done: | |||
1542 | return ret; | 1542 | return ret; |
1543 | } | 1543 | } |
1544 | 1544 | ||
1545 | void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str) | ||
1546 | { | ||
1547 | union iwreq_data iwrq; | ||
1548 | u8 buf[50]; | ||
1549 | |||
1550 | lbs_deb_enter(LBS_DEB_WEXT); | ||
1551 | |||
1552 | memset(&iwrq, 0, sizeof(union iwreq_data)); | ||
1553 | memset(buf, 0, sizeof(buf)); | ||
1554 | |||
1555 | snprintf(buf, sizeof(buf) - 1, "%s", str); | ||
1556 | |||
1557 | iwrq.data.length = strlen(buf) + 1 + IW_EV_LCP_LEN; | ||
1558 | |||
1559 | /* Send Event to upper layer */ | ||
1560 | lbs_deb_wext("event indication string %s\n", (char *)buf); | ||
1561 | lbs_deb_wext("event indication length %d\n", iwrq.data.length); | ||
1562 | lbs_deb_wext("sending wireless event IWEVCUSTOM for %s\n", str); | ||
1563 | |||
1564 | wireless_send_event(priv->dev, IWEVCUSTOM, &iwrq, buf); | ||
1565 | |||
1566 | lbs_deb_leave(LBS_DEB_WEXT); | ||
1567 | } | ||
1568 | |||
1569 | static void lbs_send_confirmsleep(struct lbs_private *priv) | 1545 | static void lbs_send_confirmsleep(struct lbs_private *priv) |
1570 | { | 1546 | { |
1571 | unsigned long flags; | 1547 | unsigned long flags; |
diff --git a/drivers/net/wireless/libertas/decl.h b/drivers/net/wireless/libertas/decl.h index 7d8323876c52..d609a57750de 100644 --- a/drivers/net/wireless/libertas/decl.h +++ b/drivers/net/wireless/libertas/decl.h | |||
@@ -44,8 +44,6 @@ struct chan_freq_power *lbs_find_cfp_by_band_and_channel( | |||
44 | u8 band, | 44 | u8 band, |
45 | u16 channel); | 45 | u16 channel); |
46 | 46 | ||
47 | void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str); | ||
48 | |||
49 | /* persistcfg.c */ | 47 | /* persistcfg.c */ |
50 | void lbs_persist_config_init(struct net_device *net); | 48 | void lbs_persist_config_init(struct net_device *net); |
51 | void lbs_persist_config_remove(struct net_device *net); | 49 | void lbs_persist_config_remove(struct net_device *net); |
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c index c688ca7ab322..18c045bcc947 100644 --- a/drivers/net/wireless/libertas/wext.c +++ b/drivers/net/wireless/libertas/wext.c | |||
@@ -45,6 +45,30 @@ static inline void lbs_cancel_association_work(struct lbs_private *priv) | |||
45 | priv->pending_assoc_req = NULL; | 45 | priv->pending_assoc_req = NULL; |
46 | } | 46 | } |
47 | 47 | ||
48 | void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str) | ||
49 | { | ||
50 | union iwreq_data iwrq; | ||
51 | u8 buf[50]; | ||
52 | |||
53 | lbs_deb_enter(LBS_DEB_WEXT); | ||
54 | |||
55 | memset(&iwrq, 0, sizeof(union iwreq_data)); | ||
56 | memset(buf, 0, sizeof(buf)); | ||
57 | |||
58 | snprintf(buf, sizeof(buf) - 1, "%s", str); | ||
59 | |||
60 | iwrq.data.length = strlen(buf) + 1 + IW_EV_LCP_LEN; | ||
61 | |||
62 | /* Send Event to upper layer */ | ||
63 | lbs_deb_wext("event indication string %s\n", (char *)buf); | ||
64 | lbs_deb_wext("event indication length %d\n", iwrq.data.length); | ||
65 | lbs_deb_wext("sending wireless event IWEVCUSTOM for %s\n", str); | ||
66 | |||
67 | wireless_send_event(priv->dev, IWEVCUSTOM, &iwrq, buf); | ||
68 | |||
69 | lbs_deb_leave(LBS_DEB_WEXT); | ||
70 | } | ||
71 | |||
48 | /** | 72 | /** |
49 | * @brief Find the channel frequency power info with specific channel | 73 | * @brief Find the channel frequency power info with specific channel |
50 | * | 74 | * |
diff --git a/drivers/net/wireless/libertas/wext.h b/drivers/net/wireless/libertas/wext.h index 4c08db497606..607d0ffefddb 100644 --- a/drivers/net/wireless/libertas/wext.h +++ b/drivers/net/wireless/libertas/wext.h | |||
@@ -4,6 +4,8 @@ | |||
4 | #ifndef _LBS_WEXT_H_ | 4 | #ifndef _LBS_WEXT_H_ |
5 | #define _LBS_WEXT_H_ | 5 | #define _LBS_WEXT_H_ |
6 | 6 | ||
7 | void lbs_send_iwevcustom_event(struct lbs_private *priv, s8 *str); | ||
8 | |||
7 | extern struct iw_handler_def lbs_handler_def; | 9 | extern struct iw_handler_def lbs_handler_def; |
8 | extern struct iw_handler_def mesh_handler_def; | 10 | extern struct iw_handler_def mesh_handler_def; |
9 | 11 | ||