Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150145
b: refs/heads/master
c: 273de92
h: refs/heads/master
i:
  150143: c1dea86
v: v3
  • Loading branch information
Michael Buesch authored and John W. Linville committed May 6, 2009
1 parent 04abb38 commit d1f5d3a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 90ccda9baccec8223ca5456fbe49adf7264d1543
refs/heads/master: 273de92c8461776aaac7b32f8d5889a72b38ea10
8 changes: 3 additions & 5 deletions trunk/net/wireless/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -384,11 +384,9 @@ cfg80211_bss_update(struct cfg80211_registered_device *dev,
} else {
u8 *ies = found->pub.information_elements;

if (found->ies_allocated) {
if (ksize(ies) < ielen)
ies = krealloc(ies, ielen,
GFP_ATOMIC);
} else
if (found->ies_allocated)
ies = krealloc(ies, ielen, GFP_ATOMIC);
else
ies = kmalloc(ielen, GFP_ATOMIC);

if (ies) {
Expand Down

0 comments on commit d1f5d3a

Please sign in to comment.