diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 19:19:50 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 19:19:50 -0800 |
| commit | 39d33d8d54ba55e49f9b430f842647a84751cb85 (patch) | |
| tree | f5a3756ea25d3b87902ae6a6a8df2428509e4246 /include/netutils | |
| parent | d8aa8ab7424be375e4408ab360c000ac8b05d15d (diff) | |
| parent | 31da9db0d1bf3227e3c383aa6ac28bde3c6409e5 (diff) | |
| download | system_core-39d33d8d54ba55e49f9b430f842647a84751cb85.tar.gz system_core-39d33d8d54ba55e49f9b430f842647a84751cb85.tar.bz2 system_core-39d33d8d54ba55e49f9b430f842647a84751cb85.zip | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/system/core into mr1
Conflicts:
adb/Android.mk
adb/usb_vendors.c
include/private/android_filesystem_config.h
include/system/audio.h
include/system/camera.h
init/property_service.c
libnetutils/ifc_utils.c
mkbootimg/mkbootimg.c
rootdir/init.rc
Change-Id: Ie42f0c14808e9f8cabd24854bfe15b6667955229
Diffstat (limited to 'include/netutils')
| -rw-r--r-- | include/netutils/ifc.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/netutils/ifc.h b/include/netutils/ifc.h index 834f73fa..11a8e1e0 100644 --- a/include/netutils/ifc.h +++ b/include/netutils/ifc.h @@ -35,6 +35,9 @@ extern int ifc_down(const char *name); extern int ifc_enable(const char *ifname); extern int ifc_disable(const char *ifname); +#define RESET_IPV4_ADDRESSES 0x01 +#define RESET_IPV6_ADDRESSES 0x02 +#define RESET_ALL_ADDRESSES (RESET_IPV4_ADDRESSES | RESET_IPV6_ADDRESSES) extern int ifc_reset_connections(const char *ifname, const int reset_mask); extern int ifc_get_addr(const char *name, in_addr_t *addr); @@ -69,6 +72,8 @@ extern int ifc_get_mtu(const char *name, int *mtuSz); extern in_addr_t prefixLengthToIpv4Netmask(int prefix_length); extern int ipv4NetmaskToPrefixLength(in_addr_t mask); +extern in_addr_t prefixLengthToIpv4Netmask(int prefix_length); + __END_DECLS #endif /* _NETUTILS_IFC_H_ */ |