diff options
| author | Justin Pettit <jpettit@nicira.com> | 2015-04-12 10:13:59 -0700 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2015-04-12 10:13:59 -0700 |
| commit | daaeeec0bd4348b1f6ac5ca5a302e57bd11cca01 (patch) | |
| tree | 5b34ccd589c61547044dfbfcf77636bfcd8ebb61 /datapath/linux/compat/include/net/ip.h | |
| parent | 717c7fc508044d08210c686c1e8576c29a108f86 (diff) | |
| parent | e8fe6ad03aa3d25b5ae99190d5aa065705a1b3c8 (diff) | |
| download | openvswitch-daaeeec0bd4348b1f6ac5ca5a302e57bd11cca01.tar.gz | |
Merge remote-tracking branch 'origin/master' into ovn
Conflicts:
tutorial/ovs-sandbox
Diffstat (limited to 'datapath/linux/compat/include/net/ip.h')
| -rw-r--r-- | datapath/linux/compat/include/net/ip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/datapath/linux/compat/include/net/ip.h b/datapath/linux/compat/include/net/ip.h index c819e4d99..b60617750 100644 --- a/datapath/linux/compat/include/net/ip.h +++ b/datapath/linux/compat/include/net/ip.h @@ -12,7 +12,7 @@ static inline bool ip_is_fragment(const struct iphdr *iph) } #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0) +#ifndef HAVE_INET_GET_LOCAL_PORT_RANGE_USING_NET static inline void rpl_inet_get_local_port_range(struct net *net, int *low, int *high) { |