diff options
| author | Stephen Hemminger <shemming@brocade.com> | 2015-10-22 23:42:37 -0700 |
|---|---|---|
| committer | Stephen Hemminger <shemming@brocade.com> | 2015-10-22 23:42:37 -0700 |
| commit | 651dccbee73fc0c1144254bb7a253c0e48411752 (patch) | |
| tree | 169c2bef592f5c4e7798ebfaec12e5331f9954aa /include | |
| parent | b89c359c15b7b20f153813aabfc62071bc6f94a8 (diff) | |
| parent | d583e88ebc859d6ef5bddffb098fa95158d55c75 (diff) | |
| download | android_external_iproute2-651dccbee73fc0c1144254bb7a253c0e48411752.tar.gz android_external_iproute2-651dccbee73fc0c1144254bb7a253c0e48411752.tar.bz2 android_external_iproute2-651dccbee73fc0c1144254bb7a253c0e48411752.zip | |
Merge branch 'master' into net-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/rtnetlink.h | 2 | ||||
| -rw-r--r-- | include/rtm_map.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 10452e0..18c543a 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -160,7 +160,7 @@ struct rtattr { /* Macros to handle rtattributes */ -#define RTA_ALIGNTO 4 +#define RTA_ALIGNTO 4U #define RTA_ALIGN(len) ( ((len)+RTA_ALIGNTO-1) & ~(RTA_ALIGNTO-1) ) #define RTA_OK(rta,len) ((len) >= (int)sizeof(struct rtattr) && \ (rta)->rta_len >= sizeof(struct rtattr) && \ diff --git a/include/rtm_map.h b/include/rtm_map.h index 70bda7d..d6e5885 100644 --- a/include/rtm_map.h +++ b/include/rtm_map.h @@ -4,7 +4,6 @@ char *rtnl_rtntype_n2a(int id, char *buf, int len); int rtnl_rtntype_a2n(int *id, char *arg); -int get_rt_realms(__u32 *realms, char *arg); - +int get_rt_realms_or_raw(__u32 *realms, char *arg); #endif /* __RTM_MAP_H__ */ |