diff options
| author | David S. Miller <davem@davemloft.net> | 2013-01-21 14:06:34 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-21 14:06:34 -0500 |
| commit | 3fcd550a4b37b1c60b4afce2e4b200919ec8bd20 (patch) | |
| tree | 867f1141b7cc2396443b7fa293124a8ef0948330 /include/linux | |
| parent | 202dc3fc599c1dded235d3b448d9ca924252e354 (diff) | |
| parent | 660b26dc1a8aeb33c2a2246ebf1b3684449a74b7 (diff) | |
| download | op-kernel-dev-3fcd550a4b37b1c60b4afce2e4b200919ec8bd20.zip op-kernel-dev-3fcd550a4b37b1c60b4afce2e4b200919ec8bd20.tar.gz | |
Merge branch 'mcast'
Nicolas Dichtel says:
====================
The goal of this serie is to add the support of proxy multicast, ie being able
to build a static multicast tree. In other words, it adds the support of (*,G)
mf[6]c entries.
v2: use INADDR_ANY instead of 0 for IPv4 addresses
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mroute.h | 2 | ||||
| -rw-r--r-- | include/linux/mroute6.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mroute.h b/include/linux/mroute.h index ea00d91..79aaa9f 100644 --- a/include/linux/mroute.h +++ b/include/linux/mroute.h @@ -9,7 +9,7 @@ #ifdef CONFIG_IP_MROUTE static inline int ip_mroute_opt(int opt) { - return (opt >= MRT_BASE) && (opt <= MRT_BASE + 10); + return (opt >= MRT_BASE) && (opt <= MRT_MAX); } #else static inline int ip_mroute_opt(int opt) diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h index a223561..66982e7 100644 --- a/include/linux/mroute6.h +++ b/include/linux/mroute6.h @@ -10,7 +10,7 @@ #ifdef CONFIG_IPV6_MROUTE static inline int ip6_mroute_opt(int opt) { - return (opt >= MRT6_BASE) && (opt <= MRT6_BASE + 10); + return (opt >= MRT6_BASE) && (opt <= MRT6_MAX); } #else static inline int ip6_mroute_opt(int opt) |
