Skip to content

Commit

Permalink
Bluetooth: Remove gfp_mask param from hci_reassembly()
Browse files Browse the repository at this point in the history 
It is unnecessary, once we are always in interrupt context.

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
  • Loading branch information
Gustavo F. Padovan committed Apr 4, 2011
1 parent 220b881 commit 1e429f3
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions net/bluetooth/hci_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1341,7 +1341,7 @@ int hci_recv_frame(struct sk_buff *skb)
EXPORT_SYMBOL(hci_recv_frame);

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 hlen = 0;
Expand Down Expand Up @@ -1371,7 +1371,7 @@ static int hci_reassembly(struct hci_dev *hdev, int type, void *data,
break;
}

skb = bt_skb_alloc(len, gfp_mask);
skb = bt_skb_alloc(len, GFP_ATOMIC);
if (!skb)
return -ENOMEM;

Expand Down Expand Up @@ -1457,8 +1457,7 @@ int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count)
return -EILSEQ;

while (count) {
rem = hci_reassembly(hdev, type, data, count,
type - 1, GFP_ATOMIC);
rem = hci_reassembly(hdev, type, data, count, type - 1);
if (rem < 0)
return rem;

Expand Down Expand Up @@ -1492,8 +1491,8 @@ int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count)
} else
type = bt_cb(skb)->pkt_type;

rem = hci_reassembly(hdev, type, data,
count, STREAM_REASSEMBLY, GFP_ATOMIC);
rem = hci_reassembly(hdev, type, data, count,
STREAM_REASSEMBLY);
if (rem < 0)
return rem;

Expand Down

0 comments on commit 1e429f3

Please sign in to comment.