2009-02-25 10:29:52

by Wei Yongjun

Subject: [PATCH] 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(-)

diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
index c9cac77..0073ec8 100644
--- a/net/bluetooth/cmtp/core.c
+++ b/net/bluetooth/cmtp/core.c
@@ -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)
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index ba78cc1..cd06151 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -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);
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index b93748e..04057db 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -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)) {
--
1.5.3.8

2009-02-25 14:28:49

by Marcel Holtmann

Subject: Re: [PATCH] bluetooth: remove some pointless conditionals before kfree_skb()

Hi Wei,

> Remove some pointless conditionals before kfree_skb().

patch has been added to my bluetooth-testing.git tree. Thanks.

Regards

Marcel