Dunno why I slipped that variable in...
Signed-off-by: Johannes Berg <[email protected]>
---
net/mac80211/ieee80211_sta.c | 2 --
1 file changed, 2 deletions(-)
--- everything.orig/net/mac80211/ieee80211_sta.c 2007-12-21 01:02:11.253160428 +0100
+++ everything/net/mac80211/ieee80211_sta.c 2007-12-21 01:02:32.113165907 +0100
@@ -458,12 +458,10 @@ static void ieee80211_set_associated(str
return;
if (assoc) {
- struct ieee80211_sub_if_data *sdata;
struct ieee80211_sta_bss *bss;
ifsta->flags |= IEEE80211_STA_ASSOCIATED;
- sdata = IEEE80211_DEV_TO_SUB_IF(dev);
if (sdata->vif.type != IEEE80211_IF_TYPE_STA)
return;
On Fri, Dec 21, 2007 at 01:58:14PM +0100, Andreas Schwab wrote:
> Johannes Berg <[email protected]> writes:
>
> >> Perhaps because it is used?
> >>
> >> > --- everything.orig/net/mac80211/ieee80211_sta.c 2007-12-21 01:02:11.253160428 +0100
> >> > +++ everything/net/mac80211/ieee80211_sta.c 2007-12-21 01:02:32.113165907 +0100
> >> > @@ -458,12 +458,10 @@ static void ieee80211_set_associated(str
> >> > return;
> >> >
> >> > if (assoc) {
> >> > - struct ieee80211_sub_if_data *sdata;
> >
> > Too little context. There's another one in the surrounding scope that is
> > already initialised exactly the same.
>
> Sorry, but I can't find it. Was it added in an unmerged patch?
I think I'm with Andreas here...?
--
John W. Linville
[email protected]
> Perhaps because it is used?
>
> > --- everything.orig/net/mac80211/ieee80211_sta.c 2007-12-21 01:02:11.253160428 +0100
> > +++ everything/net/mac80211/ieee80211_sta.c 2007-12-21 01:02:32.113165907 +0100
> > @@ -458,12 +458,10 @@ static void ieee80211_set_associated(str
> > return;
> >
> > if (assoc) {
> > - struct ieee80211_sub_if_data *sdata;
Too little context. There's another one in the surrounding scope that is
already initialised exactly the same.
johannes
Johannes Berg <[email protected]> writes:
> Dunno why I slipped that variable in...
Perhaps because it is used?
> --- everything.orig/net/mac80211/ieee80211_sta.c 2007-12-21 01:02:11.=
253160428 +0100
> +++ everything/net/mac80211/ieee80211_sta.c 2007-12-21 01:02:32.11316=
5907 +0100
> @@ -458,12 +458,10 @@ static void ieee80211_set_associated(str
> return;
> =20
> if (assoc) {
> - struct ieee80211_sub_if_data *sdata;
> struct ieee80211_sta_bss *bss;
> =20
> ifsta->flags |=3D IEEE80211_STA_ASSOCIATED;
> =20
> - sdata =3D IEEE80211_DEV_TO_SUB_IF(dev);
> if (sdata->vif.type !=3D IEEE80211_IF_TYPE_STA)
^^^^^
Andreas.
--=20
Andreas Schwab, SuSE Labs, [email protected]
SuSE Linux Products GmbH, Maxfeldstra=DFe 5, 90409 N=FCrnberg, Germany
PGP key fingerprint =3D 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4=
ED5
"And now for something completely different."
> > >> > --- everything.orig/net/mac80211/ieee80211_sta.c 2007-12-21 01:02:11.253160428 +0100
> > >> > +++ everything/net/mac80211/ieee80211_sta.c 2007-12-21 01:02:32.113165907 +0100
> > >> > @@ -458,12 +458,10 @@ static void ieee80211_set_associated(str
> > >> > return;
> > >> >
> > >> > if (assoc) {
> > >> > - struct ieee80211_sub_if_data *sdata;
> > >
> > > Too little context. There's another one in the surrounding scope that is
> > > already initialised exactly the same.
> >
> > Sorry, but I can't find it. Was it added in an unmerged patch?
>
> I think I'm with Andreas here...?
Hmm. I guess it was then.
johannes
Johannes Berg <[email protected]> writes:
>> Perhaps because it is used?
>>=20
>> > --- everything.orig/net/mac80211/ieee80211_sta.c 2007-12-21 01:02:=
11.253160428 +0100
>> > +++ everything/net/mac80211/ieee80211_sta.c 2007-12-21 01:02:32.11=
3165907 +0100
>> > @@ -458,12 +458,10 @@ static void ieee80211_set_associated(str
>> > return;
>> > =20
>> > if (assoc) {
>> > - struct ieee80211_sub_if_data *sdata;
>
> Too little context. There's another one in the surrounding scope that=
is
> already initialised exactly the same.
Sorry, but I can't find it. Was it added in an unmerged patch?
Andreas.
--=20
Andreas Schwab, SuSE Labs, [email protected]
SuSE Linux Products GmbH, Maxfeldstra=DFe 5, 90409 N=FCrnberg, Germany
PGP key fingerprint =3D 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4=
ED5
"And now for something completely different."