2008-06-04 01:47:29

by Dan Williams

[permalink] [raw]
Subject: [PATCH] mac80211: send association event on IBSS create

Otherwise userspace has no idea the IBSS creation succeeded.

Signed-off-by: Dan Williams <[email protected]>
-------------

John, please apply to 2.6.26 and later.

Stable: applicable to 2.6.24 and 2.6.25 as well. File used to be called
net/mac80211/ieee80211_sta.c and diff should still apply with minor
fuzz.

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index c220bed..fe7deb6 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2348,6 +2348,7 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
u8 *pos;
struct ieee80211_sub_if_data *sdata;
struct ieee80211_supported_band *sband;
+ union iwreq_data wrqu;

sband = local->hw.wiphy->bands[local->hw.conf.channel->band];

@@ -2865,6 +2866,10 @@ static void ieee80211_rx_bss_info(struct net_device *dev,
}
}

+ memset(&wrqu, 0, sizeof(wrqu));
+ memcpy(wrqu.ap_addr.sa_data, bss->bssid, ETH_ALEN);
+ wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
+
ieee80211_rx_bss_put(dev, bss);
}




2008-06-09 20:24:33

by Chris Wright

[permalink] [raw]
Subject: Re: [stable] [PATCH] mac80211: send association event on IBSS create

* Dan Williams ([email protected]) wrote:
> Otherwise userspace has no idea the IBSS creation succeeded.

Please resend when this hits upstream, and include the upstream commit
ID. The easiest way to achieve this is to add "Cc: <[email protected]>"
to the commit log so it gets routed to us upon commit upstream.

> Signed-off-by: Dan Williams <[email protected]>
> -------------
>
> John, please apply to 2.6.26 and later.
>
> Stable: applicable to 2.6.24 and 2.6.25 as well. File used to be called
> net/mac80211/ieee80211_sta.c and diff should still apply with minor
> fuzz.

2008-06-04 03:40:28

by Dan Williams

[permalink] [raw]
Subject: [PATCH v2] mac80211: send association event on IBSS create

=EF=BB=BFOtherwise userspace has no idea the IBSS creation succeeded.

Signed-off-by: Dan Williams <[email protected]>
-------------

John, please apply to 2.6.26 and later.

Stable: applicable to 2.6.24 and 2.6.25 as well. File used to be calle=
d
net/mac80211/ieee80211_sta.c and diff should still apply with minor
fixup to the second hunk.

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index c220bed..73c66e0 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2348,6 +2348,7 @@ static int ieee80211_sta_join_ibss(struct net_dev=
ice *dev,
u8 *pos;
struct ieee80211_sub_if_data *sdata;
struct ieee80211_supported_band *sband;
+ union iwreq_data wrqu;
=20
sband =3D local->hw.wiphy->bands[local->hw.conf.channel->band];
=20
@@ -2491,6 +2492,10 @@ static int ieee80211_sta_join_ibss(struct net_de=
vice *dev,
ifsta->state =3D IEEE80211_IBSS_JOINED;
mod_timer(&ifsta->timer, jiffies + IEEE80211_IBSS_MERGE_INTERVAL);
=20
+ memset(&wrqu, 0, sizeof(wrqu));
+ memcpy(wrqu.ap_addr.sa_data, bss->bssid, ETH_ALEN);
+ wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
+
return res;
}
=20

2008-06-04 06:11:24

by Johannes Berg

[permalink] [raw]
Subject: Re: [PATCH v2] mac80211: send association event on IBSS create

On Tue, 2008-06-03 at 23:39 -0400, Dan Williams wrote:
> Otherwise userspace has no idea the IBSS creation succeeded.
>
> Signed-off-by: Dan Williams <[email protected]>

Looks ok to me, you're the wext expert :)

Acked-by: Johannes Berg <[email protected]>

> -------------
>
> John, please apply to 2.6.26 and later.
>
> Stable: applicable to 2.6.24 and 2.6.25 as well. File used to be called
> net/mac80211/ieee80211_sta.c and diff should still apply with minor
> fixup to the second hunk.
>
> diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
> index c220bed..73c66e0 100644
> --- a/net/mac80211/mlme.c
> +++ b/net/mac80211/mlme.c
> @@ -2348,6 +2348,7 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
> u8 *pos;
> struct ieee80211_sub_if_data *sdata;
> struct ieee80211_supported_band *sband;
> + union iwreq_data wrqu;
>
> sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
>
> @@ -2491,6 +2492,10 @@ static int ieee80211_sta_join_ibss(struct net_device *dev,
> ifsta->state = IEEE80211_IBSS_JOINED;
> mod_timer(&ifsta->timer, jiffies + IEEE80211_IBSS_MERGE_INTERVAL);
>
> + memset(&wrqu, 0, sizeof(wrqu));
> + memcpy(wrqu.ap_addr.sa_data, bss->bssid, ETH_ALEN);
> + wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL);
> +
> return res;
> }
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>


Attachments:
signature.asc (828.00 B)
This is a digitally signed message part