Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
net
/
netfilter
/
ipset
/
pfxlen.c
diff --git
a/kernel/net/netfilter/ipset/pfxlen.c
b/kernel/net/netfilter/ipset/pfxlen.c
index
04d15fd
..
1c8a42c
100644
(file)
--- a/
kernel/net/netfilter/ipset/pfxlen.c
+++ b/
kernel/net/netfilter/ipset/pfxlen.c
@@
-1,9
+1,7
@@
#include <linux/export.h>
#include <linux/netfilter/ipset/pfxlen.h>
#include <linux/export.h>
#include <linux/netfilter/ipset/pfxlen.h>
-/*
- * Prefixlen maps for fast conversions, by Jan Engelhardt.
- */
+/* Prefixlen maps for fast conversions, by Jan Engelhardt. */
#define E(a, b, c, d) \
{.ip6 = { \
#define E(a, b, c, d) \
{.ip6 = { \
@@
-11,8
+9,7
@@
htonl(c), htonl(d), \
} }
htonl(c), htonl(d), \
} }
-/*
- * This table works for both IPv4 and IPv6;
+/* This table works for both IPv4 and IPv6;
* just use prefixlen_netmask_map[prefixlength].ip.
*/
const union nf_inet_addr ip_set_netmask_map[] = {
* just use prefixlen_netmask_map[prefixlength].ip.
*/
const union nf_inet_addr ip_set_netmask_map[] = {
@@
-149,13
+146,12
@@
const union nf_inet_addr ip_set_netmask_map[] = {
EXPORT_SYMBOL_GPL(ip_set_netmask_map);
#undef E
EXPORT_SYMBOL_GPL(ip_set_netmask_map);
#undef E
-#define E(a, b, c, d)
\
- {.ip6 = { (__force __be32)
a, (__force __be32) b,
\
- (__force __be32)
c, (__force __be32) d,
\
+#define E(a, b, c, d) \
+ {.ip6 = { (__force __be32)
a, (__force __be32)b,
\
+ (__force __be32)
c, (__force __be32)d,
\
} }
} }
-/*
- * This table works for both IPv4 and IPv6;
+/* This table works for both IPv4 and IPv6;
* just use prefixlen_hostmask_map[prefixlength].ip.
*/
const union nf_inet_addr ip_set_hostmask_map[] = {
* just use prefixlen_hostmask_map[prefixlength].ip.
*/
const union nf_inet_addr ip_set_hostmask_map[] = {