[4.2.y-ckt stable] Patch "uapi glibc compat: fix compilation when !__USE_MISC in glibc" has been added to the 4.2.y-ckt tree

[Kamal Mostafa]

This is a note to let you know that I have just added a patch titled

    uapi glibc compat: fix compilation when !__USE_MISC in glibc

to the linux-4.2.y-queue branch of the 4.2.y-ckt extended stable tree 
which can be found at:

    https://git.launchpad.net/~canonical-kernel/linux/+git/linux-stable-ckt/log/?h=linux-4.2.y-queue

This patch is scheduled to be released in version 4.2.8-ckt12.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 4.2.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

---8<------------------------------------------------------------

>From 26386c0c50ee46243b908728785095da700aa759 Mon Sep 17 00:00:00 2001
From: Nicolas Dichtel <nicolas.dichtel at 6wind.com>
Date: Thu, 19 May 2016 17:26:29 +0200
Subject: uapi glibc compat: fix compilation when !__USE_MISC in glibc

commit f0a3fdca794d1e68ae284ef4caefe681f7c18e89 upstream.

These structures are defined only if __USE_MISC is set in glibc net/if.h
headers, ie when _BSD_SOURCE or _SVID_SOURCE are defined.

CC: Jan Engelhardt <jengelh at inai.de>
CC: Josh Boyer <jwboyer at fedoraproject.org>
CC: Stephen Hemminger <shemming at brocade.com>
CC: Waldemar Brodkorb <mail at waldemar-brodkorb.de>
CC: Gabriel Laskar <gabriel at lse.epita.fr>
CC: Mikko Rapeli <mikko.rapeli at iki.fi>
Fixes: 4a91cb61bb99 ("uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 include/uapi/linux/libc-compat.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
index d5e38c7..e4f048e 100644
--- a/include/uapi/linux/libc-compat.h
+++ b/include/uapi/linux/libc-compat.h
@@ -52,7 +52,7 @@
 #if defined(__GLIBC__)

 /* Coordinate with glibc net/if.h header. */
-#if defined(_NET_IF_H)
+#if defined(_NET_IF_H) && defined(__USE_MISC)

 /* GLIBC headers included first so don't define anything
  * that would already be defined. */
--
2.7.4