Skip to contentSkip to conversation

Remove unused variables, causes compile warnings

PATCH In review Peter Krystad 3 participants 5 messages Jul 31, 2019 – Aug 8, 2019

Subsystems (2)
lore
Share & tools
lore

Peter Krystad

author
#0 lore raw

PATCH 1/2 Remove unused variables, causes compile warnings

squashto: Add key generation and token tree

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
---
 net/mptcp/token.c | 2 --
 1 file changed, 2 deletions(-)
net/mptcp/token.c +0 -2
index d7d81bb2e1c2..2324a477d513 100644
@@ -66,7 +66,6 @@ static struct sock *lookup_token(u32 token)
 static void new_req_token(struct request_sock *req,
 			  const struct sk_buff *skb)
 {
-	const struct inet_request_sock *ireq = inet_rsk(req);
 	struct subflow_request_sock *subflow_req = subflow_rsk(req);
 
 	crypto_key_gen_sha1(&subflow_req->local_key, &subflow_req->token,
@@ -132,7 +131,6 @@ static int new_join_valid(struct request_sock *req, struct sock *sk,
 static void new_token(const struct sock *sk)
 {
 	struct subflow_context *subflow = subflow_ctx(sk);
-	const struct inet_sock *isk = inet_sk(sk);
 
 	crypto_key_gen_sha1(&subflow->local_key, &subflow->token,
 			    &subflow->idsn);
Signature · 1 line
2.17.2
author
#1 lore raw

PATCH 2/2 Remove unused variable, causes compile warning

squashto: Add handling of incoming MP_JOIN requests

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>
---
 net/mptcp/token.c | 1 -
 1 file changed, 1 deletion(-)
net/mptcp/token.c +0 -1
index 2324a477d513..d5ae77446590 100644
@@ -77,7 +77,6 @@ static void new_req_token(struct request_sock *req,
 static void new_req_join(struct request_sock *req, struct sock *sk,
 			 const struct sk_buff *skb)
 {
-	const struct inet_request_sock *ireq = inet_rsk(req);
 	struct subflow_request_sock *subflow_req = subflow_rsk(req);
 	struct mptcp_sock *msk = mptcp_sk(sk);
 	u8 hmac[MPTCPOPT_HMAC_LEN];
Signature · 1 line
2.17.2
#2 lore raw

Re: [MPTCP] [PATCH 2/2] Remove unused variable, causes compile warning

Quoted 22 lines · Peter Krystad

squashto: Add handling of incoming MP_JOIN requests

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>

---
net/mptcp/token.c | 1 -

1 file changed, 1 deletion(-)
net/mptcp/token.c +0 -1
index 2324a477d513..d5ae77446590 100644
@@ -77,7 +77,6 @@ static void new_req_token(struct request_sock *req,
 static void new_req_join(struct request_sock *req, struct sock *sk,
 			 const struct sk_buff *skb)
 {
-	const struct inet_request_sock *ireq = inet_rsk(req);
 	struct subflow_request_sock *subflow_req = subflow_rsk(req);
 	struct mptcp_sock *msk = mptcp_sk(sk);
 	u8 hmac[MPTCPOPT_HMAC_LEN];
Signature · 1 line
2.17.2

Both patches look good to me, thanks!

--
Mat Martineau
Intel

#3 lore raw

Re: [MPTCP] [PATCH 2/2] Remove unused variable, causes compile warning

Hi Peter, Mat,

Sorry I was busy with other activities. I will merge the different pending patches that have been accepted tomorrow before the meeting.

Cheers,
Matt

Quoted 34 lines · Mat Martineau
Quoted 19 lines · Peter Krystad

squashto: Add handling of incoming MP_JOIN requests

Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>

---
net/mptcp/token.c | 1 -

1 file changed, 1 deletion(-)
net/mptcp/token.c +0 -1
index 2324a477d513..d5ae77446590 100644
@@ -77,7 +77,6 @@ static void new_req_token(struct request_sock *req,
 static void new_req_join(struct request_sock *req, struct sock *sk,
              const struct sk_buff *skb)
 {
-    const struct inet_request_sock *ireq = inet_rsk(req);
     struct subflow_request_sock *subflow_req = subflow_rsk(req);
     struct mptcp_sock *msk = mptcp_sk(sk);
     u8 hmac[MPTCPOPT_HMAC_LEN];
Quoted 3 lines

--
2.17.2

Both patches look good to me, thanks!

Signature · 6 lines
Mat Martineau
Intel
_______________________________________________
mptcp mailing list
mptcp(a)lists.01.org
https://lists.01.org/mailman/listinfo/mptcp
Signature · 5 lines
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
#4 lore raw

Re: [MPTCP] [PATCH 2/2] Remove unused variable, causes compile warning

In reply to Mat Martineau

Hi Peter, Mat,

Quoted 3 lines · Mat Martineau
Quoted 1 line · Peter Krystad

squashto: Add handling of incoming MP_JOIN requests

Thank you for the patch and the review!

Now squashed in the two mentioned commits.

c8f8ec21b850: first commit, "squashed"
80abfb72cd32: second commit, "squashed"
846ea3a5258c..1f86b8812c88: results

Regards,
Matt

Quoted 31 lines
Quoted 18 lines
Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>

---
net/mptcp/token.c | 1 -

1 file changed, 1 deletion(-)
net/mptcp/token.c +0 -1
index 2324a477d513..d5ae77446590 100644
@@ -77,7 +77,6 @@ static void new_req_token(struct request_sock *req,
 static void new_req_join(struct request_sock *req, struct sock *sk,
              const struct sk_buff *skb)
 {
-    const struct inet_request_sock *ireq = inet_rsk(req);
     struct subflow_request_sock *subflow_req = subflow_rsk(req);
     struct mptcp_sock *msk = mptcp_sk(sk);
     u8 hmac[MPTCPOPT_HMAC_LEN];
Quoted 3 lines

--
2.17.2

Both patches look good to me, thanks!

Signature · 6 lines
Mat Martineau
Intel
_______________________________________________
mptcp mailing list
mptcp(a)lists.01.org
https://lists.01.org/mailman/listinfo/mptcp
Signature · 5 lines
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium