Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0ec0b7ac3cdfb8635d75aead5733f7a424ea4ad3
Commit:     0ec0b7ac3cdfb8635d75aead5733f7a424ea4ad3
Parent:     d9430a32886f70c0c16d67c525f6cda2df7906ee
Author:     Michael Wu <[EMAIL PROTECTED]>
AuthorDate: Fri Jul 27 15:43:24 2007 +0200
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:47:40 2007 -0700

    [MAC80211]: use more GFP_KERNEL instead of GFP_ATOMIC
    
    This patch replaces atomic allocations with regular ones where possible.
    
    Merged with "revert some GFP_ATOMIC -> GFP_KERNEL changes" from Michael Wu:
    > Some of the allocations made with GFP_ATOMIC really were necessary.
    
    Signed-off-by: Michael Wu <[EMAIL PROTECTED]>
    Signed-off-by: Jiri Benc <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 net/mac80211/ieee80211_sta.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index 33414f1..f43c39f 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -363,7 +363,7 @@ static void ieee80211_sta_send_associnfo(struct net_device 
*dev,
                return;
 
        buf = kmalloc(50 + 2 * (ifsta->assocreq_ies_len +
-                               ifsta->assocresp_ies_len), GFP_ATOMIC);
+                               ifsta->assocresp_ies_len), GFP_KERNEL);
        if (!buf)
                return;
 
@@ -644,7 +644,7 @@ static void ieee80211_send_assoc(struct net_device *dev,
 
        kfree(ifsta->assocreq_ies);
        ifsta->assocreq_ies_len = (skb->data + skb->len) - ies;
-       ifsta->assocreq_ies = kmalloc(ifsta->assocreq_ies_len, GFP_ATOMIC);
+       ifsta->assocreq_ies = kmalloc(ifsta->assocreq_ies_len, GFP_KERNEL);
        if (ifsta->assocreq_ies)
                memcpy(ifsta->assocreq_ies, ies, ifsta->assocreq_ies_len);
 
@@ -1244,7 +1244,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct 
net_device *dev,
 
        kfree(ifsta->assocresp_ies);
        ifsta->assocresp_ies_len = len - (pos - (u8 *) mgmt);
-       ifsta->assocresp_ies = kmalloc(ifsta->assocresp_ies_len, GFP_ATOMIC);
+       ifsta->assocresp_ies = kmalloc(ifsta->assocresp_ies_len, GFP_KERNEL);
        if (ifsta->assocresp_ies)
                memcpy(ifsta->assocresp_ies, pos, ifsta->assocresp_ies_len);
 
@@ -1254,7 +1254,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct 
net_device *dev,
        sta = sta_info_get(local, ifsta->bssid);
        if (!sta) {
                struct ieee80211_sta_bss *bss;
-               sta = sta_info_add(local, dev, ifsta->bssid, GFP_ATOMIC);
+               sta = sta_info_add(local, dev, ifsta->bssid, GFP_KERNEL);
                if (!sta) {
                        printk(KERN_DEBUG "%s: failed to add STA entry for the"
                               " AP\n", dev->name);
@@ -1771,7 +1771,7 @@ static void ieee80211_rx_mgmt_probe_req(struct net_device 
*dev,
        }
 
        /* Reply with ProbeResp */
-       skb = skb_copy(ifsta->probe_resp, GFP_ATOMIC);
+       skb = skb_copy(ifsta->probe_resp, GFP_KERNEL);
        if (!skb)
                return;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to