On Sat, 2009-04-04 at 22:10 -0400, Bob Copeland wrote: > The ops->hw_scan callback now takes a struct *cfg80211_scan_request, > -static int wl12xx_op_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len) > +static int wl12xx_op_hw_scan(struct ieee80211_hw *hw, > + struct cfg80211_scan_request *req) > { > struct wl12xx *wl = hw->priv; > int ret; > + u8 *ssid = NULL; > + size_t ssid_len = 0; > > wl12xx_debug(DEBUG_MAC80211, "mac80211 hw scan"); > > + if (req->n_ssids) { > + ssid = req->ssids[0].ssid; > + ssid_len = req->ssids[0].ssid_len; > + } > + > mutex_lock(&wl->mutex); > - ret = wl12xx_hw_scan(hw->priv, ssid, len, 1, 0, 13, 3); > + ret = wl12xx_hw_scan(hw->priv, ssid, ssid_len, 1, 0, 13, 3); This will work for mac80211, but only by accident, and will not allow userspace to request directed scans -- you need to add hw->wiphy->max_scan_ssids = 1; somewhere. Supporting scan IEs would also be good, if possible. johannes
Attachment:
signature.asc
Description: This is a digitally signed message part