On Tue, 2013-06-18 at 12:07 +0800, Chun-Yeow Yeoh wrote: > --- a/net/mac80211/cfg.c > +++ b/net/mac80211/cfg.c > @@ -239,7 +239,10 @@ static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev, > if (mac_addr) { > ret = -ENOENT; > > - sta = sta_info_get_bss(sdata, mac_addr); > + if (ieee80211_vif_is_mesh(&sdata->vif)) > + sta = sta_info_get(sdata, mac_addr); > + else > + sta = sta_info_get_bss(sdata, mac_addr); I don't see that this actually changes anything. The mesh sdata will have a NULL bss pointer, so the second condition in sta_info_get_bss() can't be true. Therefore, only the first condition can ever be considered, which is exactly the same as sta_info_get(), no? johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html