libertas: move mic failure event to wext.c
PATCH 1/1 libertas: move mic failure event to wext.c
... because for cfg80211 we'll need a completely different implementation.
drivers/net/wireless/libertas/cmdresp.c +2 -28
@@ -73,32 +73,6 @@lbs_deb_leave (LBS_DEB_ASSOC ); } -/** -* @brief This function handles MIC failure event. -* -* @param priv A pointer to struct lbs_private structure -* @para event the event id -* @return n/a -*/ -static void handle_mic_failureevent (struct lbs_private *priv,u32 event) -{ -char buf[50 ]; - -lbs_deb_enter (LBS_DEB_CMD ); -memset (buf,0 ,sizeof (buf)); - -sprintf (buf,"%s" ,"MLME-MICHAELMICFAILURE.indication " ); - -if (event ==MACREG_INT_CODE_MIC_ERR_UNICAST ) { -strcat (buf,"unicast " ); - }else { -strcat (buf,"multicast " ); - } - -lbs_send_iwevcustom_event (priv, buf); -lbs_deb_leave (LBS_DEB_CMD ); -} -static int lbs_ret_reg_access (struct lbs_private *priv,u16 type,struct cmd_ds_command *resp) {
@@ -477,12 +451,12 @@case MACREG_INT_CODE_MIC_ERR_UNICAST :lbs_deb_cmd ("EVENT: UNICAST MIC ERROR\n" ); -handle_mic_failureevent (priv,MACREG_INT_CODE_MIC_ERR_UNICAST ); +lbs_send_mic_failureevent (priv, event);break ;case MACREG_INT_CODE_MIC_ERR_MULTICAST :lbs_deb_cmd ("EVENT: MULTICAST MIC ERROR\n" ); -handle_mic_failureevent (priv,MACREG_INT_CODE_MIC_ERR_MULTICAST ); +lbs_send_mic_failureevent (priv, event);break ;case MACREG_INT_CODE_MIB_CHANGED :
drivers/net/wireless/libertas/wext.c +26 -1
@@ -54,7 +54,7 @@wireless_send_event (priv->dev,SIOCGIWAP , &wrqu,NULL ); } -void lbs_send_iwevcustom_event (struct lbs_private *priv,s8 *str) +static void lbs_send_iwevcustom_event (struct lbs_private *priv,s8 *str) {union iwreq_data iwrq;u8 buf[50 ];
@@ -79,6 +79,31 @@ }/** +* @brief This function handles MIC failure event. +* +* @param priv A pointer to struct lbs_private structure +* @para event the event id +* @return n/a +*/ +void lbs_send_mic_failureevent (struct lbs_private *priv,u32 event) +{ +char buf[50 ]; + +lbs_deb_enter (LBS_DEB_CMD ); +memset (buf,0 ,sizeof (buf)); + +sprintf (buf,"%s" ,"MLME-MICHAELMICFAILURE.indication " ); + +if (event ==MACREG_INT_CODE_MIC_ERR_UNICAST ) +strcat (buf,"unicast " ); +else +strcat (buf,"multicast " ); + +lbs_send_iwevcustom_event (priv, buf); +lbs_deb_leave (LBS_DEB_CMD ); +} + +/** * @brief Find the channel frequency power info with specific channel * * @param priv A pointer to struct lbs_private structure
drivers/net/wireless/libertas/wext.h +1 -1
@@ -5,7 +5,7 @@#define _LBS_WEXT_H_void lbs_send_disconnect_notification (struct lbs_private *priv); -void lbs_send_iwevcustom_event (struct lbs_private *priv,s8 *str); +void lbs_send_mic_failureevent (struct lbs_private *priv,u32 event);extern struct iw_handler_def lbs_handler_def;extern struct iw_handler_def mesh_handler_def;
Signature · 1 line
http://www.holgerschurig.de
Quoted 67 lines · On Tue, 20 Oct 2009 15:05:14 +0200 Holger Schurig wrote:
... because for cfg80211 we'll need a completely different implementation.
Signed-off-by Holger Schurig <[email protected]>drivers/net/wireless/libertas/cmdresp.c +2
-28@@ -73,32 +73,6 @@lbs_deb_leave (LBS_DEB_ASSOC ); } -/** -* @brief This function handles MIC failure event. -* -* @param priv A pointer to struct lbs_private structure -* @para event the event id -* @return n/a -*/ -static void handle_mic_failureevent (struct lbs_private *priv,u32 event) -{ -char buf[50 ]; - -lbs_deb_enter (LBS_DEB_CMD ); -memset (buf,0 ,sizeof (buf)); - -sprintf (buf,"%s" ,"MLME-MICHAELMICFAILURE.indication " ); - -if (event ==MACREG_INT_CODE_MIC_ERR_UNICAST ) { -strcat (buf,"unicast " ); - }else { -strcat (buf,"multicast " ); - } - -lbs_send_iwevcustom_event (priv, buf); -lbs_deb_leave (LBS_DEB_CMD ); -} -static int lbs_ret_reg_access (struct lbs_private *priv,u16 type,struct cmd_ds_command *resp) {@@ -477,12 +451,12 @@case MACREG_INT_CODE_MIC_ERR_UNICAST :lbs_deb_cmd ("EVENT: UNICAST MIC ERROR\n" ); -handle_mic_failureevent (priv,MACREG_INT_CODE_MIC_ERR_UNICAST ); +lbs_send_mic_failureevent (priv, event);break ;case MACREG_INT_CODE_MIC_ERR_MULTICAST :lbs_deb_cmd ("EVENT: MULTICAST MIC ERROR\n" ); -handle_mic_failureevent (priv,MACREG_INT_CODE_MIC_ERR_MULTICAST ); +lbs_send_mic_failureevent (priv, event);break ;case MACREG_INT_CODE_MIB_CHANGED :drivers/net/wireless/libertas/wext.c +1
-1@@ -54,7 +54,7 @@wireless_send_event (priv->dev,SIOCGIWAP , &wrqu,NULL ); } -void lbs_send_iwevcustom_event (struct lbs_private *priv,s8 *str) +static void lbs_send_iwevcustom_event (struct lbs_private *priv,s8 *str) {union iwreq_data iwrq;u8 buf[50 ];
drivers/net/wireless/libertas/wext.c line 87
Quoted 9 lines
drivers/net/wireless/libertas/wext.c +6
-0@@ -79,6 +79,31 @@ }/** +* @brief This function handles MIC failure event. +* +* @param priv A pointer to struct lbs_private structure +* @para event the event id +* @return n/a +*/
argh. urgh. This file (or files) need to lose this non-kernel-doc function notation. Please.
Quoted 12 lines
drivers/net/wireless/libertas/wext.c +12
-0+void lbs_send_mic_failureevent (struct lbs_private *priv,u32 event) +{ +char buf[50 ]; + +lbs_deb_enter (LBS_DEB_CMD ); +memset (buf,0 ,sizeof (buf)); + +sprintf (buf,"%s" ,"MLME-MICHAELMICFAILURE.indication " ); + +if (event ==MACREG_INT_CODE_MIC_ERR_UNICAST ) +strcat (buf,"unicast " ); +else
drivers/net/wireless/libertas/wext.c line 109
Quoted 10 lines
drivers/net/wireless/libertas/wext.c +7
-0+strcat (buf,"multicast " ); + +lbs_send_iwevcustom_event (priv, buf); +lbs_deb_leave (LBS_DEB_CMD ); +} + +/** * @brief Find the channel frequency power info with specific channel * * @param priv A pointer to struct lbs_private structure
---
~Randy
Quoted 2 lines
argh. urgh. This file (or files) need to lose this non-kernel-doc function notation. Please.
Two things here:
* it's a copy and paste patch, so we move things just to another place. This makes the cfg80211-patch less intrusive and also makes the driver way smaller, once we don't compile WEXT in or get rid of WEXT altogether. Normally for copy-and-paste patches you shouldn't change other things.
* When I started with libertas, those comments where mostly useful for me. I didn't care for /** or @, as I just read the text. For me, those extra decorations have a less negative "touch". The "positive" effect of having comments at all did by far outweight the formatting.
For new code, I use a "normal" comment style, for example see
http://marc.info/?l=linux-wireless&m=125569942616188&w=2
So, if the comment style really annoys you, you could submit a comment-reformat-patch.
Signature · 1 line
http://www.holgerschurig.de