Re: [PATCH] mac80211: clean up set_key callback

[Johannes Berg <johannes@sipsolutions.net>]

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

On Tue, 2008-12-30 at 00:17 +0200, Tomas Winkler wrote:

> > @@ -3038,6 +3039,9 @@ static int iwl_mac_set_key(struct ieee80
> >        int ret = 0;
> >        u8 sta_id = IWL_INVALID_STATION;
> >        u8 is_default_wep_key = 0;
> > +       static const u8 bcast_addr[ETH_ALEN] =
> > +               { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, };
> > +       static const u8 *addr;
> 
> >        IWL_DEBUG_MAC80211("enter\n");
> >
> > @@ -3046,9 +3050,7 @@ static int iwl_mac_set_key(struct ieee80
> >                return -EOPNOTSUPP;
> >        }
> >
> > -       if (is_zero_ether_addr(addr))
> > -               /* only support pairwise keys */
> > -               return -EOPNOTSUPP;
> > +       addr = sta ? sta->addr : bcast_addr;
> >
> 
> Please use this code instead in both iwlwifi drivers.
> 
> +sta_id = sta ? iwl_find_station(priv, sta->addr) :
> priv->hw_params.bcast_sta_id;
> - sta_id = iwl_find_station(priv, addr);

Should probably be a separate patch though since this particular patch
isn't meant to change semantics here, I think.

johannes

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