cb1ce2e ("ipv6: Implement automatic flow label generation on transmit") accidentally uses socket option 64, which is already used by ip6tables: IP6T_SO_SET_REPLACE / IP6T_SO_GET_INFO 64 IP6T_SO_SET_ADD_COUNTERS / IP6T_SO_GET_ENTRIES 65 There is comment include/uapi/linux/in6.h warning about that. Allocate 70 for this, which seems to be unused instead.
Showing the changes to include/uapi/linux (1 of 1 file). Show all
Unified · Split
| @@ -233,7 +233,6 @@ struct in6_flowlabel_req { · 232 unmodified lines | ||
| 233 | 233 | #if 0 /* not yet */ |
| 234 | 234 | #define IPV6_USE_MIN_MTU 63 |
| 235 | 235 | #endif |
| 236 | −#define IPV6_AUTOFLOWLABEL 64 | |
| 237 | 236 | |
| 238 | 237 | /* |
| 239 | 238 | * Netfilter (1) |
| @@ -262,6 +261,7 @@ struct in6_flowlabel_req { · 22 unmodified lines | ||
| 262 | 261 | * IP6T_SO_ORIGINAL_DST 80 |
| 263 | 262 | */ |
| 264 | 263 | |
| 264 | +#define IPV6_AUTOFLOWLABEL 70 | |
| 265 | 265 | /* RFC5014: Source address selection */ |
| 266 | 266 | #define IPV6_ADDR_PREFERENCES 72 |
| 267 | 267 | |