Show
Ignore:
Timestamp:
07/04/09 05:10:46 (3 years ago)
Author:
proski
Message:

Merge r4022, r4059 and r4061 from trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_wireless.c

    r4013 r4068  
    16741674        struct ieee80211vap *vap = netdev_priv(dev); 
    16751675        struct ieee80211com *ic = vap->iv_ic; 
    1676         struct waplistreq req;          /* XXX off stack */ 
    1677  
    1678         req.vap = vap; 
    1679         req.i = 0; 
    1680         ieee80211_scan_iterate(ic, waplist_cb, &req); 
    1681  
    1682         data->length = req.i; 
    1683         memcpy(extra, &req.addr, req.i * sizeof(req.addr[0])); 
     1676        struct waplistreq *req; 
     1677 
     1678        req = kmalloc(sizeof(struct waplistreq), GFP_KERNEL); 
     1679        if (!req) 
     1680                return -ENOMEM; 
     1681 
     1682        req->vap = vap; 
     1683        req->i = 0; 
     1684        ieee80211_scan_iterate(ic, waplist_cb, req); 
     1685 
     1686        data->length = req->i; 
     1687        memcpy(extra, &req->addr, req->i * sizeof(req->addr[0])); 
    16841688        data->flags = 1;                /* signal quality present (sort of) */ 
    1685         memcpy(extra + req.i * sizeof(req.addr[0]), &req.qual, 
    1686                 req.i * sizeof(req.qual[0])); 
     1689        memcpy(extra + req->i * sizeof(req->addr[0]), &req->qual, 
     1690                req->i * sizeof(req->qual[0])); 
    16871691 
    16881692        return 0;