Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Bluetooth: Remove some pointless conditionals before kfree_skb()

Browse source 
Remove some pointless conditionals before kfree_skb().

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Wei Yongjun 2009-02-25 18:29:52 +08:00 committed by Marcel Holtmann
parent 2ae9a6be5f
commit 7585b97a48
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/bluetooth/cmtp/core.c
View file

@ -126,8 +126,7 @@ static inline void cmtp_add_msgpart(struct cmtp_session *session, int id, const
session->reassembly[id] = nskb; session->reassembly[id] = nskb;
if (skb) kfree_skb(skb);
kfree_skb(skb);
} }
static inline int cmtp_recv_frame(struct cmtp_session *session, struct sk_buff *skb) static inline int cmtp_recv_frame(struct cmtp_session *session, struct sk_buff *skb)

3
net/bluetooth/hci_core.c
View file

@ -1565,8 +1565,7 @@ static void hci_cmd_task(unsigned long arg)
/* Send queued commands */ /* Send queued commands */
if (atomic_read(&hdev->cmd_cnt) && (skb = skb_dequeue(&hdev->cmd_q))) { if (atomic_read(&hdev->cmd_cnt) && (skb = skb_dequeue(&hdev->cmd_q))) {
if (hdev->sent_cmd) kfree_skb(hdev->sent_cmd);
kfree_skb(hdev->sent_cmd);
if ((hdev->sent_cmd = skb_clone(skb, GFP_ATOMIC))) { if ((hdev->sent_cmd = skb_clone(skb, GFP_ATOMIC))) {
atomic_dec(&hdev->cmd_cnt); atomic_dec(&hdev->cmd_cnt);

3
net/bluetooth/l2cap.c
View file

@ -518,8 +518,7 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)
BT_DBG("hcon %p conn %p, err %d", hcon, conn, err); BT_DBG("hcon %p conn %p, err %d", hcon, conn, err);
if (conn->rx_skb) kfree_skb(conn->rx_skb);
kfree_skb(conn->rx_skb);
/* Kill channels */ /* Kill channels */
while ((sk = conn->chan_list.head)) { while ((sk = conn->chan_list.head)) {