[PATCH] Staging: agnx: switch config_interface to bss_info_changed

[PATCH] Staging: agnx: switch config_interface to bss_info_changed

[Alexander Beregalov]

Fix this build error:
drivers/staging/agnx/pci.c: In function 'agnx_config_interface':
drivers/staging/agnx/pci.c:315: error: dereferencing pointer to incomplete type
..
drivers/staging/agnx/pci.c:424: error: unknown field 'config_interface' specified in initializer

config_interface was removed in 2d0ddec5b2b
("mac80211: unify config_interface and bss_info_changed")

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---
 drivers/staging/agnx/pci.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/agnx/pci.c b/drivers/staging/agnx/pci.c
index 61b15fa..0df7d43 100644
--- a/drivers/staging/agnx/pci.c
+++ b/drivers/staging/agnx/pci.c
@@ -302,14 +302,18 @@ static int agnx_config(struct ieee80211_hw *dev, u32 changed)
 	return 0;
 }
 
-static int agnx_config_interface(struct ieee80211_hw *dev,
-				 struct ieee80211_vif *vif,
-				 struct ieee80211_if_conf *conf)
+static void agnx_bss_info_changed(struct ieee80211_hw *dev,
+				  struct ieee80211_vif *vif,
+				  struct ieee80211_bss_conf *conf,
+				  u32 changed)
 {
 	struct agnx_priv *priv = dev->priv;
 	void __iomem *ctl = priv->ctl;
 	AGNX_TRACE;
 
+	if (!(changed & BSS_CHANGED_BSSID))
+		return;
+
 	spin_lock(&priv->lock);
 
 	if (memcmp(conf->bssid, priv->bssid, ETH_ALEN)) {
@@ -322,8 +326,7 @@ static int agnx_config_interface(struct ieee80211_hw *dev,
 		agnx_write32(ctl, AGNX_BM_MTSM, 0xff & ~0x1);
 	}
 	spin_unlock(&priv->lock);
-	return 0;
-} /* agnx_config_interface */
+} /* agnx_bss_info_changed */
 
 
 static void agnx_configure_filter(struct ieee80211_hw *dev,
@@ -421,7 +424,7 @@ static struct ieee80211_ops agnx_ops = {
 	.add_interface		= agnx_add_interface,
 	.remove_interface	= agnx_remove_interface,
 	.config			= agnx_config,
-	.config_interface	= agnx_config_interface,
+	.bss_info_changed	= agnx_bss_info_changed,
 	.configure_filter	= agnx_configure_filter,
 	.get_stats		= agnx_get_stats,
 	.get_tx_stats		= agnx_get_tx_stats,
-- 
1.6.3

Re: [PATCH] Staging: agnx: switch config_interface to bss_info_changed

[Alexander Beregalov]

2009/5/12 Alexander Beregalov <a.beregalov@gmail.com>:
> Fix this build error:
> drivers/staging/agnx/pci.c: In function 'agnx_config_interface':
> drivers/staging/agnx/pci.c:315: error: dereferencing pointer to incomplete type
> ..
> drivers/staging/agnx/pci.c:424: error: unknown field 'config_interface' specified in initializer
>
> config_interface was removed in 2d0ddec5b2b
> ("mac80211: unify config_interface and bss_info_changed")
>
> Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
> ---

stlc45xx has the same problem (drivers/staging/stlc45xx/stlc45xx.c:2360)
It is not so simple, I do not know how to fix it.

Re: [PATCH] Staging: agnx: switch config_interface to bss_info_changed

[Greg KH]

On Tue, May 12, 2009 at 03:23:13PM +0400, Alexander Beregalov wrote:
> Fix this build error:
> drivers/staging/agnx/pci.c: In function 'agnx_config_interface':
> drivers/staging/agnx/pci.c:315: error: dereferencing pointer to incomplete type
> ..
> drivers/staging/agnx/pci.c:424: error: unknown field 'config_interface' specified in initializer
> 
> config_interface was removed in 2d0ddec5b2b
> ("mac80211: unify config_interface and bss_info_changed")

I do not see that patch in Linus's tree.  Is it in some other tree
(wireless?) and not yet in mainline?

confused,

greg k-h

Re: [PATCH] Staging: agnx: switch config_interface to bss_info_changed

[Alexander Beregalov]

2009/5/12 Greg KH <greg@kroah.com>:
> On Tue, May 12, 2009 at 03:23:13PM +0400, Alexander Beregalov wrote:
>> Fix this build error:
>> drivers/staging/agnx/pci.c: In function 'agnx_config_interface':
>> drivers/staging/agnx/pci.c:315: error: dereferencing pointer to incomplete type
>> ..
>> drivers/staging/agnx/pci.c:424: error: unknown field 'config_interface' specified in initializer
>>
>> config_interface was removed in 2d0ddec5b2b
>> ("mac80211: unify config_interface and bss_info_changed")
>
> I do not see that patch in Linus's tree.  Is it in some other tree
> (wireless?) and not yet in mainline?
Yes, it is in wireless from linux-next.
You asked to send patches based on linux-next, right?
Should I always mark patches for staging-next tree as [PATCH -next] ?

Re: [PATCH] Staging: agnx: switch config_interface to bss_info_changed

[Greg KH]

On Tue, May 12, 2009 at 09:37:56PM +0400, Alexander Beregalov wrote:
> 2009/5/12 Greg KH <greg@kroah.com>:
> > On Tue, May 12, 2009 at 03:23:13PM +0400, Alexander Beregalov wrote:
> >> Fix this build error:
> >> drivers/staging/agnx/pci.c: In function 'agnx_config_interface':
> >> drivers/staging/agnx/pci.c:315: error: dereferencing pointer to incomplete type
> >> ..
> >> drivers/staging/agnx/pci.c:424: error: unknown field 'config_interface' specified in initializer
> >>
> >> config_interface was removed in 2d0ddec5b2b
> >> ("mac80211: unify config_interface and bss_info_changed")
> >
> > I do not see that patch in Linus's tree.  Is it in some other tree
> > (wireless?) and not yet in mainline?
> Yes, it is in wireless from linux-next.
> You asked to send patches based on linux-next, right?
> Should I always mark patches for staging-next tree as [PATCH -next] ?

Hm, yes, -staging patches need to be against -next, but I have to be
able to build these somehow on my own without the wireless tree...

I think something like this might better go through the wireless tree as
it depends on changes that happen there.  Sound good to you?

If so, please send them to the wireless maintainer.

thanks,

greg k-h

Re: [PATCH] Staging: agnx: switch config_interface to bss_info_changed

[Alexander Beregalov]

2009/5/12 Greg KH <greg@kroah.com>:
> On Tue, May 12, 2009 at 09:37:56PM +0400, Alexander Beregalov wrote:
>> 2009/5/12 Greg KH <greg@kroah.com>:
>> > On Tue, May 12, 2009 at 03:23:13PM +0400, Alexander Beregalov wrote:
>> >> Fix this build error:
>> >> drivers/staging/agnx/pci.c: In function 'agnx_config_interface':
>> >> drivers/staging/agnx/pci.c:315: error: dereferencing pointer to incomplete type
>> >> ..
>> >> drivers/staging/agnx/pci.c:424: error: unknown field 'config_interface' specified in initializer
>> >>
>> >> config_interface was removed in 2d0ddec5b2b
>> >> ("mac80211: unify config_interface and bss_info_changed")
>> >
>> > I do not see that patch in Linus's tree.  Is it in some other tree
>> > (wireless?) and not yet in mainline?
>> Yes, it is in wireless from linux-next.
>> You asked to send patches based on linux-next, right?
>> Should I always mark patches for staging-next tree as [PATCH -next] ?
>
> Hm, yes, -staging patches need to be against -next, but I have to be
> able to build these somehow on my own without the wireless tree...
>
> I think something like this might better go through the wireless tree as
> it depends on changes that happen there.  Sound good to you?
Ok, thanks Greg.

> If so, please send them to the wireless maintainer.
John, will you apply it?

Re: [PATCH] Staging: agnx: switch config_interface to bss_info_changed

[Alexander Beregalov]

2009/5/13 Alexander Beregalov <a.beregalov@gmail.com>:
> 2009/5/12 Greg KH <greg@kroah.com>:
>> On Tue, May 12, 2009 at 09:37:56PM +0400, Alexander Beregalov wrote:
>>> 2009/5/12 Greg KH <greg@kroah.com>:
>>> > On Tue, May 12, 2009 at 03:23:13PM +0400, Alexander Beregalov wrote:
>>> >> Fix this build error:
>>> >> drivers/staging/agnx/pci.c: In function 'agnx_config_interface':
>>> >> drivers/staging/agnx/pci.c:315: error: dereferencing pointer to incomplete type
>>> >> ..
>>> >> drivers/staging/agnx/pci.c:424: error: unknown field 'config_interface' specified in initializer
>>> >>
>>> >> config_interface was removed in 2d0ddec5b2b
>>> >> ("mac80211: unify config_interface and bss_info_changed")
>>> >
>>> > I do not see that patch in Linus's tree.  Is it in some other tree
>>> > (wireless?) and not yet in mainline?
>>> Yes, it is in wireless from linux-next.
>>> You asked to send patches based on linux-next, right?
>>> Should I always mark patches for staging-next tree as [PATCH -next] ?
>>
>> Hm, yes, -staging patches need to be against -next, but I have to be
>> able to build these somehow on my own without the wireless tree...
>>
>> I think something like this might better go through the wireless tree as
>> it depends on changes that happen there.  Sound good to you?
> Ok, thanks Greg.
>
>> If so, please send them to the wireless maintainer.
> John, will you apply it?

John?

Re: [PATCH] Staging: agnx: switch config_interface to bss_info_changed

[John W. Linville]

On Tue, May 19, 2009 at 04:12:50PM +0400, Alexander Beregalov wrote:
> 2009/5/13 Alexander Beregalov <a.beregalov@gmail.com>:
> > 2009/5/12 Greg KH <greg@kroah.com>:
> >> On Tue, May 12, 2009 at 09:37:56PM +0400, Alexander Beregalov wrote:
> >>> 2009/5/12 Greg KH <greg@kroah.com>:
> >>> > On Tue, May 12, 2009 at 03:23:13PM +0400, Alexander Beregalov wrote:
> >>> >> Fix this build error:
> >>> >> drivers/staging/agnx/pci.c: In function 'agnx_config_interface':
> >>> >> drivers/staging/agnx/pci.c:315: error: dereferencing pointer to incomplete type
> >>> >> ..
> >>> >> drivers/staging/agnx/pci.c:424: error: unknown field 'config_interface' specified in initializer
> >>> >>
> >>> >> config_interface was removed in 2d0ddec5b2b
> >>> >> ("mac80211: unify config_interface and bss_info_changed")
> >>> >
> >>> > I do not see that patch in Linus's tree.  Is it in some other tree
> >>> > (wireless?) and not yet in mainline?
> >>> Yes, it is in wireless from linux-next.
> >>> You asked to send patches based on linux-next, right?
> >>> Should I always mark patches for staging-next tree as [PATCH -next] ?
> >>
> >> Hm, yes, -staging patches need to be against -next, but I have to be
> >> able to build these somehow on my own without the wireless tree...
> >>
> >> I think something like this might better go through the wireless tree as
> >> it depends on changes that happen there.  Sound good to you?
> > Ok, thanks Greg.
> >
> >> If so, please send them to the wireless maintainer.
> > John, will you apply it?
> 
> John?

*grumble*

I guess I will...

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.