diff options
author | Andre Guedes <aguedespe@gmail.com> | 2012-06-07 18:05:46 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-06-18 23:53:38 -0400 |
commit | 790eff4429e45b850859f1bb8117846dafd5f86a (patch) | |
tree | 1302668439c368f19152293fe49c97a49afcee83 /net/bluetooth | |
parent | 12b9456502d421a8272615fb641349eb2013b6d8 (diff) |
Bluetooth: Use GFP_KERNEL in mgmt events functions
cmd_status, cmd_complete and mgmt_event functions are executed in
process context and they are not called inside atomic sections. Thus,
they should use GFP_KERNEL for memory allocation instead of GFP_ATOMIC.
Signed-off-by: Andre Guedes <aguedespe@gmail.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/mgmt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 41b5192bc041..2f9f52f19b48 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -210,7 +210,7 @@ static int cmd_status(struct sock *sk, u16 index, u16 cmd, u8 status) | |||
210 | 210 | ||
211 | BT_DBG("sock %p, index %u, cmd %u, status %u", sk, index, cmd, status); | 211 | BT_DBG("sock %p, index %u, cmd %u, status %u", sk, index, cmd, status); |
212 | 212 | ||
213 | skb = alloc_skb(sizeof(*hdr) + sizeof(*ev), GFP_ATOMIC); | 213 | skb = alloc_skb(sizeof(*hdr) + sizeof(*ev), GFP_KERNEL); |
214 | if (!skb) | 214 | if (!skb) |
215 | return -ENOMEM; | 215 | return -ENOMEM; |
216 | 216 | ||
@@ -241,7 +241,7 @@ static int cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status, | |||
241 | 241 | ||
242 | BT_DBG("sock %p", sk); | 242 | BT_DBG("sock %p", sk); |
243 | 243 | ||
244 | skb = alloc_skb(sizeof(*hdr) + sizeof(*ev) + rp_len, GFP_ATOMIC); | 244 | skb = alloc_skb(sizeof(*hdr) + sizeof(*ev) + rp_len, GFP_KERNEL); |
245 | if (!skb) | 245 | if (!skb) |
246 | return -ENOMEM; | 246 | return -ENOMEM; |
247 | 247 | ||
@@ -812,7 +812,7 @@ static int mgmt_event(u16 event, struct hci_dev *hdev, void *data, u16 data_len, | |||
812 | struct sk_buff *skb; | 812 | struct sk_buff *skb; |
813 | struct mgmt_hdr *hdr; | 813 | struct mgmt_hdr *hdr; |
814 | 814 | ||
815 | skb = alloc_skb(sizeof(*hdr) + data_len, GFP_ATOMIC); | 815 | skb = alloc_skb(sizeof(*hdr) + data_len, GFP_KERNEL); |
816 | if (!skb) | 816 | if (!skb) |
817 | return -ENOMEM; | 817 | return -ENOMEM; |
818 | 818 | ||