Hi!
> 
> If necessary enable the tx path in monitor mode for packet injection using
> the JOIN command with BSS_TYPE_STA_BSS and zero BSSID.
> 
> Signed-off-by: David Gnedt <david.gn...@davizone.at>
> ---
>  drivers/net/wireless/ti/wl1251/main.c   |    5 +++++
>  drivers/net/wireless/ti/wl1251/tx.c     |   17 +++++++++++++++++
>  drivers/net/wireless/ti/wl1251/wl1251.h |    1 +
>  3 files changed, 23 insertions(+)
> 
> diff --git a/drivers/net/wireless/ti/wl1251/main.c 
> b/drivers/net/wireless/ti/wl1251/main.c
> diff --git a/drivers/net/wireless/ti/wl1251/tx.c 
> b/drivers/net/wireless/ti/wl1251/tx.c
> index 3cc82fd..1de4ccb 100644
> --- a/drivers/net/wireless/ti/wl1251/tx.c
> +++ b/drivers/net/wireless/ti/wl1251/tx.c
> @@ -28,6 +28,7 @@
>  #include "tx.h"
>  #include "ps.h"
>  #include "io.h"
> +#include "event.h"
>  
>  static bool wl1251_tx_double_buffer_busy(struct wl1251 *wl, u32 
> data_out_count)
>  {
> @@ -298,6 +299,22 @@ static int wl1251_tx_frame(struct wl1251 *wl, struct 
> sk_buff *skb)
>               }
>       }
>  
> +     /* Enable tx path in monitor mode for packet injection */
> +     if ((wl->vif == NULL) && !wl->joined) {
> +             ret = wl1251_cmd_join(wl, BSS_TYPE_STA_BSS, wl->channel,
> +                                   wl->beacon_int, wl->dtim_period);
> +             if (ret < 0)
> +                     wl1251_warning("join failed");
> +             else {
> +                     ret = wl1251_event_wait(wl, JOIN_EVENT_COMPLETE_ID,
> +                                             100);
> +                     if (ret < 0)
> +                             wl1251_warning("join timeout");
> +                     else
> +                             wl->joined = true;
> +             }
> +     }

Create function enable_tx_for_packet_injection() and then just return
so that you don't have to nest ifs?

Thanks,
                                                                        Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) 
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to