History

mcast: define and use MRT[6]_MAX in ip[6]_mroute_opt()

This will ease further addition of new MRT[6]_* values and avoid to update in6.h each time. Note that we reduce the maximum value from 210 to 209, but 210 does not match any known value in ip[6]_mroute_setsockopt().

Nicolas Dichtel committed 13 years ago

Commit bbb923a1 parent 202dc3f5 files · +8 −13Browse files

Showing the changes to include/uapi/linux (3 of 5 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/in6.h +4 −11
  2. include/uapi/linux/mroute.h +1 −0
  3. include/uapi/linux/mroute6.h +1 −0
include/uapi/linux/in6.h+4−11
@@ -259,17 +259,10 @@ struct in6_flowlabel_req { · 258 unmodified lines
259259
260260 /*
261261 * Multicast Routing:
262− * see include/linux/mroute6.h.
262+ * see include/uapi/linux/mroute6.h.
263263 *
264− * MRT6_INIT 200
265− * MRT6_DONE 201
266− * MRT6_ADD_MIF 202
267− * MRT6_DEL_MIF 203
268− * MRT6_ADD_MFC 204
269− * MRT6_DEL_MFC 205
270− * MRT6_VERSION 206
271− * MRT6_ASSERT 207
272− * MRT6_PIM 208
273− * (reserved) 209
264+ * MRT6_BASE 200
265+ * ...
266+ * MRT6_MAX
274267 */
275268 #endif /* _UAPI_LINUX_IN6_H */
include/uapi/linux/mroute.h+1−0
@@ -26,6 +26,7 @@ · 25 unmodified lines
2626 #define MRT_ASSERT (MRT_BASE+7) /* Activate PIM assert mode */
2727 #define MRT_PIM (MRT_BASE+8) /* enable PIM code */
2828 #define MRT_TABLE (MRT_BASE+9) /* Specify mroute table ID */
29+#define MRT_MAX (MRT_BASE+9)
2930
3031 #define SIOCGETVIFCNT SIOCPROTOPRIVATE /* IP protocol privates */
3132 #define SIOCGETSGCNT (SIOCPROTOPRIVATE+1)
include/uapi/linux/mroute6.h+1−0
@@ -26,6 +26,7 @@ · 25 unmodified lines
2626 #define MRT6_ASSERT (MRT6_BASE+7) /* Activate PIM assert mode */
2727 #define MRT6_PIM (MRT6_BASE+8) /* enable PIM code */
2828 #define MRT6_TABLE (MRT6_BASE+9) /* Specify mroute table ID */
29+#define MRT6_MAX (MRT6_BASE+9)
2930
3031 #define SIOCGETMIFCNT_IN6 SIOCPROTOPRIVATE /* IP protocol privates */
3132 #define SIOCGETSGCNT_IN6 (SIOCPROTOPRIVATE+1)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t