summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer2008-05-16 16:10:31 +0000
committerBernhard Reutner-Fischer2008-05-16 16:10:31 +0000
commitf3b778a4dcfe49dbb294365e7f026674a91f9a32 (patch)
treed68b08af40a70399b5027949541d1f08696d4925 /include
parent825968f92c603357e2e1e1d73c3ec26d89004381 (diff)
downloadbusybox-f3b778a4dcfe49dbb294365e7f026674a91f9a32.zip
busybox-f3b778a4dcfe49dbb294365e7f026674a91f9a32.tar.gz
- fix bug where we incorrectly rejected ifconfig eth0 hw ether $whatever
- add support for printing ipoib to ifconfig
Diffstat (limited to 'include')
-rw-r--r--include/libbb.h3
-rw-r--r--include/usage.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 216b3ec..6f41184 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -924,6 +924,9 @@ struct hwtype {
};
extern smallint interface_opt_a;
int display_interfaces(char *ifname);
+#if ENABLE_FEATURE_HWIB
+int in_ib(const char *bufp, struct sockaddr *sap);
+#endif
const struct aftype *get_aftype(const char *name);
const struct hwtype *get_hwtype(const char *name);
const struct hwtype *get_hwntype(int type);
diff --git a/include/usage.h b/include/usage.h
index efba092..f912d7b 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1628,7 +1628,7 @@
" [netmask ADDRESS] [dstaddr ADDRESS]\n" \
USE_FEATURE_IFCONFIG_SLIP( \
" [outfill NN] [keepalive NN]\n") \
- " " USE_FEATURE_IFCONFIG_HW("[hw ether ADDRESS] ") "[metric NN] [mtu NN]\n" \
+ " " USE_FEATURE_IFCONFIG_HW("[hw ether" USE_FEATURE_HWIB("|infiniband")" ADDRESS] ") "[metric NN] [mtu NN]\n" \
" [[-]trailers] [[-]arp] [[-]allmulti]\n" \
" [multicast] [[-]promisc] [txqueuelen NN] [[-]dynamic]\n" \
USE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ( \