Skip to content

Commit

Permalink
Bluetooth: Remove some pointless conditionals before kfree_skb()
Browse files Browse the repository at this point in the history
Remove some pointless conditionals before kfree_skb().

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Wei Yongjun authored and Marcel Holtmann committed Feb 27, 2009
1 parent 2ae9a6b commit 7585b97
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions net/bluetooth/cmtp/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions net/bluetooth/hci_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions net/bluetooth/l2cap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

if (conn->rx_skb)
kfree_skb(conn->rx_skb);
kfree_skb(conn->rx_skb);

/* Kill channels */
while ((sk = conn->chan_list.head)) {
Expand Down

0 comments on commit 7585b97

Please sign in to comment.