5 files changed, 18 insertions, 9 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 4cb8a1385539..44f5ce1fbfa4 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -458,7 +458,7 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
         err = -EADDRNOTAVAIL;
         if (!sysctl_ip_nonlocal_bind &&
             !inet->freebind &&
-            addr->sin_addr.s_addr != INADDR_ANY &&
+            addr->sin_addr.s_addr != htonl(INADDR_ANY) &&
             chk_addr_ret != RTN_LOCAL &&
             chk_addr_ret != RTN_MULTICAST &&
             chk_addr_ret != RTN_BROADCAST)
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 091e6709f831..f3ceca31aa45 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -168,7 +168,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
                 struct xfrm_encap_tmpl *encap = x->encap;
                 struct udphdr *uh;
                 __be32 *udpdata32;
-                unsigned int sport, dport;
+                __be16 sport, dport;
                 int encap_type;
 
                 spin_lock_bh(&x->lock);
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index e7c9e4e72327..bb3cbe5ec36d 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -583,7 +583,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                 }
 
                 if (!mreq.imr_ifindex) {
-                        if (mreq.imr_address.s_addr == INADDR_ANY) {
+                        if (mreq.imr_address.s_addr == htonl(INADDR_ANY)) {
                                 inet->mc_index = 0;
                                 inet->mc_addr  = 0;
                                 err = 0;
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 4afce0572806..96138b128de8 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -103,6 +103,7 @@
                                            - '3' from resolv.h */
 
 #define NONE __constant_htonl(INADDR_NONE)
+#define ANY __constant_htonl(INADDR_ANY)
 
 /*
  * Public IP configuration
@@ -1476,19 +1477,19 @@ static int __init ip_auto_config_setup(char *addrs)
                         DBG(("IP-Config: Parameter #%d: `%s'\n", num, ip));
                         switch (num) {
                         case 0:
-                                if ((ic_myaddr = in_aton(ip)) == INADDR_ANY)
+                                if ((ic_myaddr = in_aton(ip)) == ANY)
                                         ic_myaddr = NONE;
                                 break;
                         case 1:
-                                if ((ic_servaddr = in_aton(ip)) == INADDR_ANY)
+                                if ((ic_servaddr = in_aton(ip)) == ANY)
                                         ic_servaddr = NONE;
                                 break;
                         case 2:
-                                if ((ic_gateway = in_aton(ip)) == INADDR_ANY)
+                                if ((ic_gateway = in_aton(ip)) == ANY)
                                         ic_gateway = NONE;
                                 break;
                         case 3:
-                                if ((ic_netmask = in_aton(ip)) == INADDR_ANY)
+                                if ((ic_netmask = in_aton(ip)) == ANY)
                                         ic_netmask = NONE;
                                 break;
                         case 4:
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index cbfef8b1f5e8..67f84f5035c4 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1035,6 +1035,13 @@ static void tcp_cwnd_validate(struct sock *sk)
  * introducing MSS oddities to segment boundaries. In rare cases where
  * mss_now != mss_cache, we will request caller to create a small skb
  * per input skb which could be mostly avoided here (if desired).
+ *
+ * We explicitly want to create a request for splitting write queue tail
+ * to a small skb for Nagle purposes while avoiding unnecessary modulos,
+ * thus all the complexity (cwnd_len is always MSS multiple which we
+ * return whenever allowed by the other factors). Basically we need the
+ * modulo only when the receiver window alone is the limiting factor or
+ * when we would be allowed to send the split-due-to-Nagle skb fully.
  */
 static unsigned int tcp_mss_split_point(struct sock *sk, struct sk_buff *skb,
                                         unsigned int mss_now, unsigned int cwnd)
@@ -1048,10 +1055,11 @@ static unsigned int tcp_mss_split_point(struct sock *sk, struct sk_buff *skb,
         if (likely(cwnd_len <= window && skb != tcp_write_queue_tail(sk)))
                 return cwnd_len;
 
-        if (skb == tcp_write_queue_tail(sk) && cwnd_len <= skb->len)
+        needed = min(skb->len, window);
+
+        if (skb == tcp_write_queue_tail(sk) && cwnd_len <= needed)
                 return cwnd_len;
 
-        needed = min(skb->len, window);
         return needed - needed % mss_now;
 }