bluetooth: remove some pointless conditionals before kfree_skb()
Subsystems (4)
PATCH 1/1 bluetooth: remove some pointless conditionals before kfree_skb()
Remove some pointless conditionals before kfree_skb().
Signed-off-by Wei Yongjun <[email protected]>
--- net/bluetooth/cmtp/core.c | 3 +-- net/bluetooth/hci_core.c | 3 +-- net/bluetooth/l2cap.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-)
net/bluetooth/cmtp/core.c +1 -2
@@ -126,8 +126,7 @@ static inline void cmtp_add_msgpart(struct cmtp_session *session, int id, const 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)
net/bluetooth/hci_core.c +1 -2
@@ -1565,8 +1565,7 @@ static void hci_cmd_task(unsigned long arg)/* Send queued commands */ 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 ))) {atomic_dec (&hdev->cmd_cnt);
net/bluetooth/l2cap.c +1 -2
@@ -483,8 +483,7 @@ static void l2cap_conn_del(struct hci_conn *hcon, int 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 */ while ((sk = conn->chan_list.head)) {
Signature · 1 line
1.5.3.8
Hi Wei,
Quoted 1 line
Remove some pointless conditionals before
kfree_skb().
patch has been added to my bluetooth-testing.git tree. Thanks.
Regards
Marcel