Forráskód Böngészése

Bluetooth: Fix confusion between parent and child channel for 6lowpan

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>
Johan Hedberg 11 éve
szülő
commit
2b29349044
1 módosított fájl, 5 hozzáadás és 5 törlés
  1. 5 5
      net/bluetooth/6lowpan.c

+ 5 - 5
net/bluetooth/6lowpan.c

@@ -772,16 +772,16 @@ static inline void chan_ready_cb(struct l2cap_chan *chan)
 	ifup(dev->netdev);
 	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);
 	BT_DBG("chan %p pchan %p", chan, pchan);
 
 
-	return pchan;
+	return chan;
 }
 }
 
 
 static void delete_netdev(struct work_struct *work)
 static void delete_netdev(struct work_struct *work)