diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-12 23:30:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-12 23:30:45 -0700 |
| commit | bf47f4b0babe287f250dd720b41ecad9b8f7ac9b (patch) | |
| tree | 0829ef3bff455f98155b5cb0e91b71db36de3510 /include/linux/rtnetlink.h | |
| parent | 0b9715e64f7d46a9620d4d5042a5e28f5595ed54 (diff) | |
| parent | 5b285cac3570a935aaa28312c1ea28f9e01c5452 (diff) | |
| download | op-kernel-dev-bf47f4b0babe287f250dd720b41ecad9b8f7ac9b.zip op-kernel-dev-bf47f4b0babe287f250dd720b41ecad9b8f7ac9b.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6
Diffstat (limited to 'include/linux/rtnetlink.h')
| -rw-r--r-- | include/linux/rtnetlink.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 5a42c36..fbc8cb0 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -11,7 +11,8 @@ * families, values above 128 may be used arbitrarily. */ #define RTNL_FAMILY_IPMR 128 -#define RTNL_FAMILY_MAX 128 +#define RTNL_FAMILY_IP6MR 129 +#define RTNL_FAMILY_MAX 129 /**** * Routing/neighbour discovery messages. |
