[PATCH] mac80211: add sta item when changing WDS address

[PATCH] mac80211: add sta item when changing WDS address

[Johannes Berg]

This patch adds a sta item for the new address when you change a WDS
link's address. If the sta item cannot be created return an error.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

---
 net/mac80211/ieee80211.c |    9 +++++++++
 1 file changed, 9 insertions(+)

--- wireless-dev.orig/net/mac80211/ieee80211.c	2007-03-27 16:33:29.523155480 +0200
+++ wireless-dev/net/mac80211/ieee80211.c	2007-03-27 16:33:47.163155480 +0200
@@ -4418,6 +4418,15 @@ int ieee80211_if_update_wds(struct net_d
 	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 	struct sta_info *sta;
 
+	if (compare_ether_addr(remote_addr, sdata->u.wds.remote_addr) == 0)
+		return 0;
+
+	/* Create STA entry for the new peer */
+	sta = sta_info_add(local, dev, remote_addr, GFP_KERNEL);
+	if (!sta)
+		return -ENOMEM;
+	sta_info_put(sta);
+
 	/* Remove STA entry for the old peer */
 	sta = sta_info_get(local, sdata->u.wds.remote_addr);
 	if (sta) {

Re: [PATCH] mac80211: add sta item when changing WDS address

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 966 bytes --]

On Tue, 2007-03-27 at 18:01 +0200, Johannes Berg wrote:
> This patch adds a sta item for the new address when you change a WDS
> link's address. If the sta item cannot be created return an error.

Anything wrong with this patch? :)

> --- wireless-dev.orig/net/mac80211/ieee80211.c	2007-03-27 16:33:29.523155480 +0200
> +++ wireless-dev/net/mac80211/ieee80211.c	2007-03-27 16:33:47.163155480 +0200
> @@ -4418,6 +4418,15 @@ int ieee80211_if_update_wds(struct net_d
>  	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
>  	struct sta_info *sta;
>  
> +	if (compare_ether_addr(remote_addr, sdata->u.wds.remote_addr) == 0)
> +		return 0;
> +
> +	/* Create STA entry for the new peer */
> +	sta = sta_info_add(local, dev, remote_addr, GFP_KERNEL);
> +	if (!sta)
> +		return -ENOMEM;
> +	sta_info_put(sta);
> +
>  	/* Remove STA entry for the old peer */
>  	sta = sta_info_get(local, sdata->u.wds.remote_addr);
>  	if (sta) {


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 190 bytes --]

Re: [PATCH] mac80211: add sta item when changing WDS address

[John W. Linville]

On Fri, Apr 27, 2007 at 05:12:52PM +0200, Johannes Berg wrote:
> On Tue, 2007-03-27 at 18:01 +0200, Johannes Berg wrote:
> > This patch adds a sta item for the new address when you change a WDS
> > link's address. If the sta item cannot be created return an error.
> 
> Anything wrong with this patch? :)

Hopefully nothing...I merged it as commit d80bb18ca3444520b465f3006bbb78837a5e28d9.

John
-- 
John W. Linville
linville@tuxdriver.com

Re: [PATCH] mac80211: add sta item when changing WDS address

[Jiri Benc]

On Fri, 27 Apr 2007 17:12:52 +0200, Johannes Berg wrote:
> On Tue, 2007-03-27 at 18:01 +0200, Johannes Berg wrote:
> > This patch adds a sta item for the new address when you change a WDS
> > link's address. If the sta item cannot be created return an error.
> 
> Anything wrong with this patch? :)

It's in wireless-dev for quite some time (commit
d80bb18ca3444520b465f3006bbb78837a5e28d9). Did I miss some problem when
I was looking at the patch?

 Jiri

-- 
Jiri Benc
SUSE Labs

Re: [PATCH] mac80211: add sta item when changing WDS address

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 690 bytes --]

On Fri, 2007-04-27 at 17:23 +0200, Jiri Benc wrote:
> On Fri, 27 Apr 2007 17:12:52 +0200, Johannes Berg wrote:
> > On Tue, 2007-03-27 at 18:01 +0200, Johannes Berg wrote:
> > > This patch adds a sta item for the new address when you change a WDS
> > > link's address. If the sta item cannot be created return an error.
> > 
> > Anything wrong with this patch? :)
> 
> It's in wireless-dev for quite some time (commit
> d80bb18ca3444520b465f3006bbb78837a5e28d9). Did I miss some problem when
> I was looking at the patch?

No no! I just thought it wasn't because quilt managed to apply the patch
over it being applied already and so it was still in my patch queue.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 190 bytes --]