diff options
-rw-r--r-- | net/ipv4/fib_frontend.c | 2 | ||||
-rw-r--r-- | net/ipv4/ip_forward.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp_output.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 2eb909be8041..eff6bce453ee 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c | |||
@@ -817,7 +817,7 @@ static void nl_fib_input(struct sock *sk, int len) | |||
817 | static void nl_fib_lookup_init(void) | 817 | static void nl_fib_lookup_init(void) |
818 | { | 818 | { |
819 | netlink_kernel_create(NETLINK_FIB_LOOKUP, 0, nl_fib_input, NULL, | 819 | netlink_kernel_create(NETLINK_FIB_LOOKUP, 0, nl_fib_input, NULL, |
820 | THIS_MODULE); | 820 | THIS_MODULE); |
821 | } | 821 | } |
822 | 822 | ||
823 | static void fib_disable_ip(struct net_device *dev, int force) | 823 | static void fib_disable_ip(struct net_device *dev, int force) |
diff --git a/net/ipv4/ip_forward.c b/net/ipv4/ip_forward.c index 9cb04df0054b..8c95cf09f87a 100644 --- a/net/ipv4/ip_forward.c +++ b/net/ipv4/ip_forward.c | |||
@@ -86,7 +86,7 @@ int ip_forward(struct sk_buff *skb) | |||
86 | goto sr_failed; | 86 | goto sr_failed; |
87 | 87 | ||
88 | if (unlikely(skb->len > dst_mtu(&rt->u.dst) && | 88 | if (unlikely(skb->len > dst_mtu(&rt->u.dst) && |
89 | (ip_hdr(skb)->frag_off & htons(IP_DF))) && !skb->local_df) { | 89 | (ip_hdr(skb)->frag_off & htons(IP_DF))) && !skb->local_df) { |
90 | IP_INC_STATS(IPSTATS_MIB_FRAGFAILS); | 90 | IP_INC_STATS(IPSTATS_MIB_FRAGFAILS); |
91 | icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, | 91 | icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, |
92 | htonl(dst_mtu(&rt->u.dst))); | 92 | htonl(dst_mtu(&rt->u.dst))); |
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 20aea1595c4d..666d8a58d14a 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -1615,7 +1615,7 @@ u32 __tcp_select_window(struct sock *sk) | |||
1615 | if (window <= free_space - mss || window > free_space) | 1615 | if (window <= free_space - mss || window > free_space) |
1616 | window = (free_space/mss)*mss; | 1616 | window = (free_space/mss)*mss; |
1617 | else if (mss == full_space && | 1617 | else if (mss == full_space && |
1618 | free_space > window + full_space/2) | 1618 | free_space > window + full_space/2) |
1619 | window = free_space; | 1619 | window = free_space; |
1620 | } | 1620 | } |
1621 | 1621 | ||