Bluetooth: Move more channel info to struct l2cap_chan

In this commit, omtu, imtu, flush_to, mode and sport. It also remove the
pi var from l2cap_sock_sendmsg().

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

1 files changed, 7 insertions, 7 deletions

diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 02db90210f8d..7522835c24ee 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -285,6 +285,13 @@ struct srej_list {
 struct l2cap_chan {
         struct sock *sk;
 
+        __u16           imtu;
+        __u16           omtu;
+        __u16           flush_to;
+        __u8            mode;
+
+        __le16          sport;
+
         __u8            sec_level;
         __u8            role_switch;
         __u8            force_reliable;
@@ -379,13 +386,6 @@ struct l2cap_pinfo {
         __u16           dcid;
         __u16           scid;
 
-        __u16           imtu;
-        __u16           omtu;
-        __u16           flush_to;
-        __u8            mode;
-
-        __le16          sport;
-
         struct l2cap_conn       *conn;
         struct l2cap_chan       *chan;
 };