Commit cfd280c91253 ("net: sync some IP headers with glibc") changed a set of define's to an enum (with no explanation why) which introduced a bug in module mip6 where aliases are generated using the IPPROTO_* defines; mip6 doesn't load if require_module called with the aliases from xfrm_get_type(). Reverting this change back to define's to fix the aliases. modinfo mip6 (before this change) alias: xfrm-type-10-IPPROTO_DSTOPTS alias: xfrm-type-10-IPPROTO_ROUTING modinfo mip6 (after this change) alias: xfrm-type-10-43 alias: xfrm-type-10-60
Showing the changes to include/uapi/linux (1 of 1 file). Show all
Unified · Split
| @@ -128,22 +128,13 @@ struct in6_flowlabel_req { · 127 unmodified lines | ||
| 128 | 128 | * IPV6 extension headers |
| 129 | 129 | */ |
| 130 | 130 | #if __UAPI_DEF_IPPROTO_V6 |
| 131 | −enum { | |
| 132 | − IPPROTO_HOPOPTS = 0, /* IPv6 hop-by-hop options */ | |
| 133 | −#define IPPROTO_HOPOPTS IPPROTO_HOPOPTS | |
| 134 | − IPPROTO_ROUTING = 43, /* IPv6 routing header */ | |
| 135 | −#define IPPROTO_ROUTING IPPROTO_ROUTING | |
| 136 | − IPPROTO_FRAGMENT = 44, /* IPv6 fragmentation header */ | |
| 137 | −#define IPPROTO_FRAGMENT IPPROTO_FRAGMENT | |
| 138 | − IPPROTO_ICMPV6 = 58, /* ICMPv6 */ | |
| 139 | −#define IPPROTO_ICMPV6 IPPROTO_ICMPV6 | |
| 140 | − IPPROTO_NONE = 59, /* IPv6 no next header */ | |
| 141 | −#define IPPROTO_NONE IPPROTO_NONE | |
| 142 | − IPPROTO_DSTOPTS = 60, /* IPv6 destination options */ | |
| 143 | −#define IPPROTO_DSTOPTS IPPROTO_DSTOPTS | |
| 144 | − IPPROTO_MH = 135, /* IPv6 mobility header */ | |
| 145 | −#define IPPROTO_MH IPPROTO_MH | |
| 146 | −}; | |
| 131 | +#define IPPROTO_HOPOPTS 0 /* IPv6 hop-by-hop options */ | |
| 132 | +#define IPPROTO_ROUTING 43 /* IPv6 routing header */ | |
| 133 | +#define IPPROTO_FRAGMENT 44 /* IPv6 fragmentation header */ | |
| 134 | +#define IPPROTO_ICMPV6 58 /* ICMPv6 */ | |
| 135 | +#define IPPROTO_NONE 59 /* IPv6 no next header */ | |
| 136 | +#define IPPROTO_DSTOPTS 60 /* IPv6 destination options */ | |
| 137 | +#define IPPROTO_MH 135 /* IPv6 mobility header */ | |
| 147 | 138 | #endif /* __UAPI_DEF_IPPROTO_V6 */ |
| 148 | 139 | |
| 149 | 140 | /* |