Bluetooth: Fix confusion between parent and child channel for 6lowpan
authorJohan Hedberg <johan.hedberg@intel.com>
Thu, 7 Aug 2014 07:03:32 +0000 (10:03 +0300)
committerMarcel Holtmann <marcel@holtmann.org>
Thu, 14 Aug 2014 06:49:11 +0000 (08:49 +0200)
The new_connection L2CAP channel callback creates a new channel based on
the provided parent channel. The 6lowpan code was confusingly naming the
child channel "pchan" and the parent channel "chan". This patch swaps
the names.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/6lowpan.c

index 206b65c..35ebe79 100644 (file)
@@ -772,16 +772,16 @@ static inline void chan_ready_cb(struct l2cap_chan *chan)
        ifup(dev->netdev);
 }
 
-static inline struct l2cap_chan *chan_new_conn_cb(struct l2cap_chan *chan)
+static inline struct l2cap_chan *chan_new_conn_cb(struct l2cap_chan *pchan)
 {
-       struct l2cap_chan *pchan;
+       struct l2cap_chan *chan;
 
-       pchan = chan_open(chan);
-       pchan->ops = chan->ops;
+       chan = chan_open(pchan);
+       chan->ops = pchan->ops;
 
        BT_DBG("chan %p pchan %p", chan, pchan);
 
-       return pchan;
+       return chan;
 }
 
 static void delete_netdev(struct work_struct *work)