[PATCH net-2.6 2/2] ipv6: minor cleanup in net/ipv6/tcp_ipv6.c.

[PATCH net-2.6 2/2] ipv6: minor cleanup in net/ipv6/tcp_ipv6.c.

[Rami Rosen]

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

Hi,

In net/ipv6/tcp_ipv6.c:

1) Remove unneeded tcp_v6_send_check() declaration.

2) Unify two consecutive #ifdef CONFIG_TCP_MD5SIG (with nothing in
   between them) into one #ifdef CONFIG_TCP_MD5SIG.


Regards,
Rami Rosen


Signed-off-by: Rami Rosen <ramirose@gmail.com>

[-- Attachment #2: patch2.txt --]
[-- Type: text/plain, Size: 1126 bytes --]

From 2274d94fafcfa8e1420fba7b5f081caa27d8688c Mon Sep 17 00:00:00 2001
From: root <root@sbc54.(none)>
Date: Mon, 16 Jun 2008 11:45:05 +0300
Subject: [PATCH 1220/1220] tcp_ipv6.c cleanup


Signed-off-by: root <root@sbc54.(none)>
---
 net/ipv6/tcp_ipv6.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index cb46749..0a437e0 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -72,8 +72,6 @@
 
 static void	tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb);
 static void	tcp_v6_reqsk_send_ack(struct sk_buff *skb, struct request_sock *req);
-static void	tcp_v6_send_check(struct sock *sk, int len,
-				  struct sk_buff *skb);
 
 static int	tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb);
 
@@ -1101,9 +1099,6 @@ static void tcp_v6_send_ack(struct tcp_timewait_sock *tw,
 #ifdef CONFIG_TCP_MD5SIG
 	struct tcp_md5sig_key *key;
 	struct tcp_md5sig_key tw_key;
-#endif
-
-#ifdef CONFIG_TCP_MD5SIG
 	if (!tw && skb->sk) {
 		key = tcp_v6_md5_do_lookup(skb->sk, &ipv6_hdr(skb)->daddr);
 	} else if (tw && tw->tw_md5_keylen) {
-- 
1.5.3.3

Re: [PATCH net-2.6 2/2] ipv6: minor cleanup in net/ipv6/tcp_ipv6.c

[Rami Rosen]

[-- Attachment #1: Type: text/plain, Size: 447 bytes --]

Hi,
Fixing signed-off by line also in this second patch,
Rami

On Mon, Jun 16, 2008 at 12:41 PM, YOSHIFUJI Hideaki / 吉藤英明
<yoshfuji@linux-ipv6.org> wrote:
> In article <eb3ff54b0806160207r473055c3y329b6ec66b902572@mail.gmail.com> (at Mon, 16 Jun 2008 12:07:31 +0300), "Rami Rosen" <ramirose@gmail.com> says:
>
>> Signed-off-by: Rami Rosen <ramirose@gmail.com>
>
> Would you please fix signed-off-by line in the patches?
>
> --yoshfuji
>

[-- Attachment #2: patch2.txt --]
[-- Type: text/plain, Size: 797 bytes --]

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index cb46749..0a437e0 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -72,8 +72,6 @@
 
 static void	tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb);
 static void	tcp_v6_reqsk_send_ack(struct sk_buff *skb, struct request_sock *req);
-static void	tcp_v6_send_check(struct sock *sk, int len,
-				  struct sk_buff *skb);
 
 static int	tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb);
 
@@ -1101,9 +1099,6 @@ static void tcp_v6_send_ack(struct tcp_timewait_sock *tw,
 #ifdef CONFIG_TCP_MD5SIG
 	struct tcp_md5sig_key *key;
 	struct tcp_md5sig_key tw_key;
-#endif
-
-#ifdef CONFIG_TCP_MD5SIG
 	if (!tw && skb->sk) {
 		key = tcp_v6_md5_do_lookup(skb->sk, &ipv6_hdr(skb)->daddr);
 	} else if (tw && tw->tw_md5_keylen) {

Re: [PATCH net-2.6 2/2] ipv6: minor cleanup in net/ipv6/tcp_ipv6.c.

[David Miller]

From: "Rami Rosen" <ramirose@gmail.com>
Date: Mon, 16 Jun 2008 12:09:31 +0300

> 2) Unify two consecutive #ifdef CONFIG_TCP_MD5SIG (with nothing in
>    between them) into one #ifdef CONFIG_TCP_MD5SIG.

I think there should be an empty line between local variable
declarations and actual code in a function.  Please fix this
up, thanks.