l2tp: ignore L2TP_ATTR_DATA_SEQ netlink attribute

The value of this attribute is never used.

Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 5 insertions, 20 deletions

diff --git a/include/uapi/linux/l2tp.h b/include/uapi/linux/l2tp.h
index 7d570c7bd117..ae888606b3ec 100644
--- a/include/uapi/linux/l2tp.h
+++ b/include/uapi/linux/l2tp.h
@@ -65,9 +65,9 @@ struct sockaddr_l2tpip6 {
  * TUNNEL_MODIFY        - CONN_ID, udpcsum
  * TUNNEL_GETSTATS      - CONN_ID, (stats)
  * TUNNEL_GET           - CONN_ID, (...)
- * SESSION_CREATE       - SESSION_ID, PW_TYPE, data_seq, cookie, peer_cookie, l2spec
+ * SESSION_CREATE       - SESSION_ID, PW_TYPE, cookie, peer_cookie, l2spec
  * SESSION_DELETE       - SESSION_ID
- * SESSION_MODIFY       - SESSION_ID, data_seq
+ * SESSION_MODIFY       - SESSION_ID
  * SESSION_GET          - SESSION_ID, (...)
  * SESSION_GETSTATS     - SESSION_ID, (stats)
  *
@@ -95,7 +95,7 @@ enum {
         L2TP_ATTR_PW_TYPE,              /* u16, enum l2tp_pwtype */
         L2TP_ATTR_ENCAP_TYPE,           /* u16, enum l2tp_encap_type */
         L2TP_ATTR_OFFSET,               /* u16 (not used) */
-        L2TP_ATTR_DATA_SEQ,             /* u16 */
+        L2TP_ATTR_DATA_SEQ,             /* u16 (not used) */
         L2TP_ATTR_L2SPEC_TYPE,          /* u8, enum l2tp_l2spec_type */
         L2TP_ATTR_L2SPEC_LEN,           /* u8 (not used) */
         L2TP_ATTR_PROTO_VERSION,        /* u8 */
@@ -169,6 +169,7 @@ enum l2tp_encap_type {
         L2TP_ENCAPTYPE_IP,
 };
 
+/* For L2TP_ATTR_DATA_SEQ. Unused. */
 enum l2tp_seqmode {
         L2TP_SEQ_NONE = 0,
         L2TP_SEQ_IP = 1,
diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h
index d85fde793a8c..7dbfb55ab3b5 100644
--- a/net/l2tp/l2tp_core.h
+++ b/net/l2tp/l2tp_core.h
@@ -45,10 +45,6 @@ struct l2tp_tunnel;
  */
 struct l2tp_session_cfg {
         enum l2tp_pwtype        pw_type;
-        unsigned int            data_seq:2;     /* data sequencing level
-                                                 * 0 => none, 1 => IP only,
-                                                 * 2 => all
-                                                 */
         unsigned int            recv_seq:1;     /* expect receive packets with
                                                  * sequence numbers? */
         unsigned int            send_seq:1;     /* send packets with sequence
@@ -99,10 +95,6 @@ struct l2tp_session {
 
         char                    name[32];       /* for logging */
         char                    ifname[IFNAMSIZ];
-        unsigned int            data_seq:2;     /* data sequencing level
-                                                 * 0 => none, 1 => IP only,
-                                                 * 2 => all
-                                                 */
         unsigned int            recv_seq:1;     /* expect receive packets with
                                                  * sequence numbers? */
         unsigned int            send_seq:1;     /* send packets with sequence
diff --git a/net/l2tp/l2tp_debugfs.c b/net/l2tp/l2tp_debugfs.c
index b5d7dde003ef..91b9248610f0 100644
--- a/net/l2tp/l2tp_debugfs.c
+++ b/net/l2tp/l2tp_debugfs.c
@@ -191,12 +191,10 @@ static void l2tp_dfs_seq_session_show(struct seq_file *m, void *v)
         if (session->send_seq || session->recv_seq)
                 seq_printf(m, "   nr %hu, ns %hu\n", session->nr, session->ns);
         seq_printf(m, "   refcnt %d\n", refcount_read(&session->ref_count));
-        seq_printf(m, "   config %d/%d/%c/%c/%s/%s %08x %u\n",
+        seq_printf(m, "   config %d/%d/%c/%c/-/%s %08x %u\n",
                    session->mtu, session->mru,
                    session->recv_seq ? 'R' : '-',
                    session->send_seq ? 'S' : '-',
-                   session->data_seq == 1 ? "IPSEQ" :
-                   session->data_seq == 2 ? "DATASEQ" : "-",
                    session->lns_mode ? "LNS" : "LAC",
                    session->debug,
                    jiffies_to_msecs(session->reorder_timeout));
diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c
index 5b9900889e31..e4785f6966f6 100644
--- a/net/l2tp/l2tp_netlink.c
+++ b/net/l2tp/l2tp_netlink.c
@@ -560,9 +560,6 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf
         }
 
         if (tunnel->version > 2) {
-                if (info->attrs[L2TP_ATTR_DATA_SEQ])
-                        cfg.data_seq = nla_get_u8(info->attrs[L2TP_ATTR_DATA_SEQ]);
-
                 if (info->attrs[L2TP_ATTR_L2SPEC_TYPE]) {
                         cfg.l2specific_type = nla_get_u8(info->attrs[L2TP_ATTR_L2SPEC_TYPE]);
                         if (cfg.l2specific_type != L2TP_L2SPECTYPE_DEFAULT &&
@@ -693,9 +690,6 @@ static int l2tp_nl_cmd_session_modify(struct sk_buff *skb, struct genl_info *inf
         if (info->attrs[L2TP_ATTR_DEBUG])
                 session->debug = nla_get_u32(info->attrs[L2TP_ATTR_DEBUG]);
 
-        if (info->attrs[L2TP_ATTR_DATA_SEQ])
-                session->data_seq = nla_get_u8(info->attrs[L2TP_ATTR_DATA_SEQ]);
-
         if (info->attrs[L2TP_ATTR_RECV_SEQ])
                 session->recv_seq = nla_get_u8(info->attrs[L2TP_ATTR_RECV_SEQ]);