diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-05-16 16:10:31 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-05-16 16:10:31 +0000 |
commit | f3b778a4dcfe49dbb294365e7f026674a91f9a32 (patch) | |
tree | d68b08af40a70399b5027949541d1f08696d4925 /include | |
parent | 825968f92c603357e2e1e1d73c3ec26d89004381 (diff) | |
download | busybox-w32-f3b778a4dcfe49dbb294365e7f026674a91f9a32.tar.gz busybox-w32-f3b778a4dcfe49dbb294365e7f026674a91f9a32.tar.bz2 busybox-w32-f3b778a4dcfe49dbb294365e7f026674a91f9a32.zip |
- 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.h | 3 | ||||
-rw-r--r-- | include/usage.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h index 216b3eca3..6f41184a9 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -924,6 +924,9 @@ struct hwtype { | |||
924 | }; | 924 | }; |
925 | extern smallint interface_opt_a; | 925 | extern smallint interface_opt_a; |
926 | int display_interfaces(char *ifname); | 926 | int display_interfaces(char *ifname); |
927 | #if ENABLE_FEATURE_HWIB | ||
928 | int in_ib(const char *bufp, struct sockaddr *sap); | ||
929 | #endif | ||
927 | const struct aftype *get_aftype(const char *name); | 930 | const struct aftype *get_aftype(const char *name); |
928 | const struct hwtype *get_hwtype(const char *name); | 931 | const struct hwtype *get_hwtype(const char *name); |
929 | const struct hwtype *get_hwntype(int type); | 932 | const struct hwtype *get_hwntype(int type); |
diff --git a/include/usage.h b/include/usage.h index efba0924a..f912d7b88 100644 --- a/include/usage.h +++ b/include/usage.h | |||
@@ -1628,7 +1628,7 @@ | |||
1628 | " [netmask ADDRESS] [dstaddr ADDRESS]\n" \ | 1628 | " [netmask ADDRESS] [dstaddr ADDRESS]\n" \ |
1629 | USE_FEATURE_IFCONFIG_SLIP( \ | 1629 | USE_FEATURE_IFCONFIG_SLIP( \ |
1630 | " [outfill NN] [keepalive NN]\n") \ | 1630 | " [outfill NN] [keepalive NN]\n") \ |
1631 | " " USE_FEATURE_IFCONFIG_HW("[hw ether ADDRESS] ") "[metric NN] [mtu NN]\n" \ | 1631 | " " USE_FEATURE_IFCONFIG_HW("[hw ether" USE_FEATURE_HWIB("|infiniband")" ADDRESS] ") "[metric NN] [mtu NN]\n" \ |
1632 | " [[-]trailers] [[-]arp] [[-]allmulti]\n" \ | 1632 | " [[-]trailers] [[-]arp] [[-]allmulti]\n" \ |
1633 | " [multicast] [[-]promisc] [txqueuelen NN] [[-]dynamic]\n" \ | 1633 | " [multicast] [[-]promisc] [txqueuelen NN] [[-]dynamic]\n" \ |
1634 | USE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ( \ | 1634 | USE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ( \ |