diff --git a/[refs] b/[refs] index 78cc1c1541b5..5c1e0f050e7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3146a7da83ba2dd266ef436d4ac8e7e09bd15825 +refs/heads/master: 50521aa8817e3f6a77eb7aaabdbbb7b5c2fe0ea3 diff --git a/trunk/net/wireless/scan.c b/trunk/net/wireless/scan.c index 3772638714fa..34b47b30be88 100644 --- a/trunk/net/wireless/scan.c +++ b/trunk/net/wireless/scan.c @@ -715,11 +715,8 @@ cfg80211_inform_bss(struct wiphy *wiphy, * Response frame, we need to pick one of the options and only use it * with the driver that does not provide the full Beacon/Probe Response * frame. Use Beacon frame pointer to avoid indicating that this should - * override the iies pointer should we have received an earlier + * override the IEs pointer should we have received an earlier * indication of Probe Response data. - * - * The initial buffer for the IEs is allocated with the BSS entry and - * is located after the private area. */ ies = kmalloc(sizeof(*ies) + ielen, gfp); if (!ies)