Message ID | 1395237505-20550-2-git-send-email-dbaluta@ixiacom.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Wed, Mar 19, 2014 at 3:58 PM, Daniel Baluta <dbaluta@ixiacom.com> wrote: > Signed-off-by: Daniel Baluta <dbaluta@ixiacom.com> > --- > net/ipv4/tcp_ipv4.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c > index c4f1d9a..4555244 100644 > --- a/net/ipv4/tcp_ipv4.c > +++ b/net/ipv4/tcp_ipv4.c > @@ -880,8 +880,6 @@ bool tcp_syn_flood_action(struct sock *sk, > bool want_cookie = false; > struct listen_sock *lopt; > > - > - > #ifdef CONFIG_SYN_COOKIES > if (sysctl_tcp_syncookies) { > msg = "Sending cookies"; Sorry for the duplicate email. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Daniel Baluta <dbaluta@ixiacom.com> Date: Wed, 19 Mar 2014 15:58:25 +0200 > Signed-off-by: Daniel Baluta <dbaluta@ixiacom.com> Applied to net-next, thank you. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index c4f1d9a..4555244 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -880,8 +880,6 @@ bool tcp_syn_flood_action(struct sock *sk, bool want_cookie = false; struct listen_sock *lopt; - - #ifdef CONFIG_SYN_COOKIES if (sysctl_tcp_syncookies) { msg = "Sending cookies";
Signed-off-by: Daniel Baluta <dbaluta@ixiacom.com> --- net/ipv4/tcp_ipv4.c | 2 -- 1 file changed, 2 deletions(-)