From 29b76dcd83a9e1068f4835a8540b2e22314a0abb Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 27 Jan 2017 14:52:45 +0100
Subject: Remove support for !defined(__GLIBC__) and __GLIBC__ != 2.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---
 ax25/bpqparms.c     | 2 --
 ax25/mheardd.c      | 4 ----
 ax25/rxecho.c       | 8 --------
 hdlcutil/hdrvcomm.c | 4 ----
 kiss/kissparms.c    | 4 ----
 kiss/net2kiss.c     | 4 ----
 netrom/netromd.c    | 4 ----
 netrom/netromr.c    | 4 ----
 yamdrv/yamcfg.c     | 4 ----
 9 files changed, 38 deletions(-)

diff --git a/ax25/bpqparms.c b/ax25/bpqparms.c
index 27007dc..a29bd6a 100644
--- a/ax25/bpqparms.c
+++ b/ax25/bpqparms.c
@@ -29,9 +29,7 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
-#ifdef __GLIBC__
 #include <net/ethernet.h> /* is this really needed ??  */
-#endif
 
 #include <linux/bpqether.h> /* xlz - dammit, we need this again */
 
diff --git a/ax25/mheardd.c b/ax25/mheardd.c
index cbe5e26..a1c121b 100644
--- a/ax25/mheardd.c
+++ b/ax25/mheardd.c
@@ -15,11 +15,7 @@
 
 #include <sys/socket.h>
 
-#ifdef __GLIBC__
 #include <net/ethernet.h>
-#else
-#include <linux/if_ether.h>
-#endif
 
 #include <netinet/in.h>
 
diff --git a/ax25/rxecho.c b/ax25/rxecho.c
index 597e6cb..bfc326a 100644
--- a/ax25/rxecho.c
+++ b/ax25/rxecho.c
@@ -87,7 +87,6 @@
 #endif
 
 #include <features.h>    /* for the glibc version number */
-#if __GLIBC__ >= 2
 #ifdef	USE_SOCKADDR_SPKT
 #include <net/if_packet.h>
 #endif
@@ -97,13 +96,6 @@
 #include <netpacket/packet.h>
 #endif
 #include <net/ethernet.h>
-#else
-#if defined(USE_SOCKADDR_SPKT) || defined(USE_SOCKADDR_SLL)
-#include <asm/types.h>
-#include <linux/if_packet.h>
-#endif
-#include <linux/if_ether.h>
-#endif
 
 #include <netinet/in.h>
 
diff --git a/hdlcutil/hdrvcomm.c b/hdlcutil/hdrvcomm.c
index d0dc8b6..2e41ddb 100644
--- a/hdlcutil/hdrvcomm.c
+++ b/hdlcutil/hdrvcomm.c
@@ -49,11 +49,7 @@
 #include "usersmdiag.h"
 #include <net/if_arp.h>
 
-#ifdef __GLIBC__
 #include <net/ethernet.h>
-#else
-#include <linux/if_ether.h>
-#endif
 
 #include <linux/if_packet.h>
 #ifndef SOL_PACKET
diff --git a/kiss/kissparms.c b/kiss/kissparms.c
index 6a27dc7..def7b59 100644
--- a/kiss/kissparms.c
+++ b/kiss/kissparms.c
@@ -11,11 +11,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#ifdef __GLIBC__
 #include <net/ethernet.h>
-#else
-#include <linux/if_ether.h>
-#endif
 
 #include <netax25/ax25.h>
 #include <netrose/rose.h>
diff --git a/kiss/net2kiss.c b/kiss/net2kiss.c
index d2f25bf..1c1b50d 100644
--- a/kiss/net2kiss.c
+++ b/kiss/net2kiss.c
@@ -52,11 +52,7 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
-#ifdef __GLIBC__
 #include <net/ethernet.h>
-#else
-#include <linux/if_ether.h>
-#endif
 
 
 /* --------------------------------------------------------------------- */
diff --git a/netrom/netromd.c b/netrom/netromd.c
index 394e75f..13737d8 100644
--- a/netrom/netromd.c
+++ b/netrom/netromd.c
@@ -18,11 +18,7 @@
 
 #include <net/if.h>
 
-#ifdef __GLIBC__
 #include <net/ethernet.h>
-#else
-#include <linux/if_ether.h>
-#endif
 
 #include <netax25/ax25.h>
 #include <netrom/netrom.h>
diff --git a/netrom/netromr.c b/netrom/netromr.c
index e55c2a2..bc677a7 100644
--- a/netrom/netromr.c
+++ b/netrom/netromr.c
@@ -14,11 +14,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#ifdef __GLIBC__
 #include <net/ethernet.h>
-#else
-#include <linux/if_ether.h>
-#endif
 
 #include <netax25/ax25.h>
 #include <netrom/netrom.h>
diff --git a/yamdrv/yamcfg.c b/yamdrv/yamcfg.c
index 1e40fd2..b14d6ff 100644
--- a/yamdrv/yamcfg.c
+++ b/yamdrv/yamcfg.c
@@ -47,11 +47,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if.h>
-#ifdef __GLIBC__
 #include <netinet/if_ether.h>
-#else
-#include <linux/if_ether.h>
-#endif
 #include <endian.h>
 #include <netinet/in.h>
 
-- 
cgit v1.2.3