Return-path: Received: from nbd.name ([88.198.39.176]:33975 "EHLO ds10.nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751390Ab0IWJ40 (ORCPT ); Thu, 23 Sep 2010 05:56:26 -0400 Message-ID: <4C9B2444.9030608@openwrt.org> Date: Thu, 23 Sep 2010 11:56:20 +0200 From: Felix Fietkau MIME-Version: 1.0 To: greearb@gmail.com CC: linux-wireless@vger.kernel.org, Ben Greear Subject: Re: [mac80211] ath5k: Support virtual interfaces. References: <1285213229-19138-1-git-send-email-greearb@candelatech.com> In-Reply-To: <1285213229-19138-1-git-send-email-greearb@candelatech.com> Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: On 2010-09-23 5:40 AM, greearb@gmail.com wrote: > From: Ben Greear > > This allows ath5k to support virtual STA and AP interfaces. > > This patch is ported forward from a patch that Patrick McHardy > did for me against 2.6.31. > > Signed-off-by: Ben Greear > --- > :100644 100644 504c6d6... 49f10ea... M drivers/net/wireless/ath/ath5k/base.c > :100644 100644 7f9d0d3... ec5c3c0... M drivers/net/wireless/ath/ath5k/base.h > :100644 100644 58912cd... 5b179d0... M drivers/net/wireless/ath/ath5k/reset.c > drivers/net/wireless/ath/ath5k/base.c | 249 +++++++++++++++++++++++++++----- > drivers/net/wireless/ath/ath5k/base.h | 27 +++- > drivers/net/wireless/ath/ath5k/reset.c | 4 +- > 3 files changed, 236 insertions(+), 44 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c > index 504c6d6..49f10ea 100644 > --- a/drivers/net/wireless/ath/ath5k/base.c > +++ b/drivers/net/wireless/ath/ath5k/base.c > @@ -509,6 +509,29 @@ ath5k_setcurmode(struct ath5k_softc *sc, unsigned int mode) > } > } > > +static void ath5k_update_bssid_mask(struct ath5k_softc *sc) > +{ > + struct ath5k_vif *avf; > + unsigned int i, j; > + > + /* > + * This doesn't include the address of the default STA device in case > + * it is reconfigured since for some reason it is not created through > + * ->add_interface(). > + */ > + memset(sc->bssidmask, 0xff, ETH_ALEN); > + for (i = 0; i < ATH5K_VIF_MAX; i++) { > + if (sc->vifs[i] == NULL) > + continue; > + avf = (void *)sc->vifs[i]->drv_priv; > + for (j = 0; j < ETH_ALEN; j++) { > + sc->bssidmask[j] &= ~(sc->lladdr[j] ^ avf->lladdr[j]); > + sc->bssidmask[j] &= ~(sc->lladdr[j] ^ avf->bssid[j]); avf->bssid seems to be duplicated. I think you can remove that field entirely. And even if it were to contain the BSSID (in the STA case), you should not use it to calculate the bssidmask. > @@ -2671,30 +2764,70 @@ static int ath5k_add_interface(struct ieee80211_hw *hw, > { > struct ath5k_softc *sc = hw->priv; > int ret; > + struct ath5k_hw *ah = sc->ah; > + struct ath5k_vif *avf = (void *)vif->drv_priv; > + unsigned int i; > > mutex_lock(&sc->lock); > - if (sc->vif) { > - ret = 0; > + > + if (sc->nvifs > 1 && !modparam_nohwcrypt) { > + pr_err("ath5k: can not add multiple virtual interfaces with hardware encryption\n"); Why not? Other drivers can do this just fine. > diff --git a/drivers/net/wireless/ath/ath5k/base.h b/drivers/net/wireless/ath/ath5k/base.h > index 7f9d0d3..ec5c3c0 100644 > --- a/drivers/net/wireless/ath/ath5k/base.h > +++ b/drivers/net/wireless/ath/ath5k/base.h > @@ -58,8 +58,8 @@ > > #define ATH_RXBUF 40 /* number of RX buffers */ > #define ATH_TXBUF 200 /* number of TX buffers */ > -#define ATH_BCBUF 1 /* number of beacon buffers */ > - > +#define ATH_BCBUF 16 /* number of beacon buffers */ A value of 16 here seems a bit much for staggered beacons. IMHO that will increase the likelihood of stuck beacon issues in the long run. I think 4 would be a better value to start with for now. In the future we should probably make the SWBA timing more dynamic based on the actual number of AP mode interfaces. - Felix