Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Lots of conflicts, by happily all cases of overlapping
changes, parallel adds, things of that nature.

Thanks to Stephen Rothwell, Saeed Mahameed, and others
for their guidance in these resolutions.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 2 deletions

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 5b9b6d497f71..04ba321ae5ce 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -952,17 +952,18 @@ static int inet_abc_len(__be32 addr)
 {
         int rc = -1;    /* Something else, probably a multicast. */
 
-        if (ipv4_is_zeronet(addr))
+        if (ipv4_is_zeronet(addr) || ipv4_is_lbcast(addr))
                 rc = 0;
         else {
                 __u32 haddr = ntohl(addr);
-
                 if (IN_CLASSA(haddr))
                         rc = 8;
                 else if (IN_CLASSB(haddr))
                         rc = 16;
                 else if (IN_CLASSC(haddr))
                         rc = 24;
+                else if (IN_CLASSE(haddr))
+                        rc = 32;
         }
 
         return rc;