aboutsummaryrefslogtreecommitdiff
path: root/networking/interface.c
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2012-03-22 15:41:00 +0000
committerRon Yorston <rmy@pobox.com>2012-03-22 15:41:00 +0000
commit1118c95535ea51961437089fc3dece5ab4ea7e1b (patch)
tree1515bd2376a6d6c5123791662307ce2ed90cdf36 /networking/interface.c
parent0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (diff)
parent066f39956641300c1e5c6bfe6c11a115cea3e2cf (diff)
downloadbusybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.gz
busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.bz2
busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.zip
Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge
Conflicts: procps/ps.c
Diffstat (limited to 'networking/interface.c')
-rw-r--r--networking/interface.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/networking/interface.c b/networking/interface.c
index bea54c180..79c322ec0 100644
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -30,15 +30,14 @@
30 * 20001008 - Bernd Eckenfels, Patch from RH for setting mtu 30 * 20001008 - Bernd Eckenfels, Patch from RH for setting mtu
31 * (default AF was wrong) 31 * (default AF was wrong)
32 */ 32 */
33
34#include "libbb.h"
35#include "inet_common.h"
33#include <net/if.h> 36#include <net/if.h>
34#include <net/if_arp.h> 37#include <net/if_arp.h>
35#ifndef __UCLIBC__ 38#ifdef HAVE_NET_ETHERNET_H
36# include <net/ethernet.h> 39# include <net/ethernet.h>
37#else
38# include <linux/if_ether.h>
39#endif 40#endif
40#include "libbb.h"
41#include "inet_common.h"
42 41
43#if ENABLE_FEATURE_HWIB 42#if ENABLE_FEATURE_HWIB
44/* #include <linux/if_infiniband.h> */ 43/* #include <linux/if_infiniband.h> */