lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: Remove gfp_mask param from hci_reassembly()

Browse Source 
It is unnecessary, once we are always in interrupt context.

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Gustavo F. Padovan
2011-04-04 18:25:14 -03:00
parent 220b881a77
commit 1e429f3842
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net/bluetooth/hci_core.c
View File

@@ -1341,7 +1341,7 @@ int hci_recv_frame(struct sk_buff *skb)
EXPORT_SYMBOL(hci_recv_frame); EXPORT_SYMBOL(hci_recv_frame);
static int hci_reassembly(struct hci_dev *hdev, int type, void *data, static int hci_reassembly(struct hci_dev *hdev, int type, void *data,
int count, __u8 index, gfp_t gfp_mask) int count, __u8 index)
{ {
int len = 0; int len = 0;
int hlen = 0; int hlen = 0;
@@ -1371,7 +1371,7 @@ static int hci_reassembly(struct hci_dev *hdev, int type, void *data,
break; break;
} }
skb = bt_skb_alloc(len, gfp_mask); skb = bt_skb_alloc(len, GFP_ATOMIC);
if (!skb) if (!skb)
return -ENOMEM; return -ENOMEM;
@@ -1457,8 +1457,7 @@ int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count)
return -EILSEQ; return -EILSEQ;
while (count) { while (count) {
rem = hci_reassembly(hdev, type, data, count, rem = hci_reassembly(hdev, type, data, count, type - 1);
type - 1, GFP_ATOMIC);
if (rem < 0) if (rem < 0)
return rem; return rem;
@@ -1492,8 +1491,8 @@ int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count)
} else } else
type = bt_cb(skb)->pkt_type; type = bt_cb(skb)->pkt_type;
rem = hci_reassembly(hdev, type, data, rem = hci_reassembly(hdev, type, data, count,
count, STREAM_REASSEMBLY, GFP_ATOMIC); STREAM_REASSEMBLY);
if (rem < 0) if (rem < 0)
return rem; return rem;