diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-05-01 11:17:24 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-06-30 23:05:22 +0200 |
| commit | f5fe5cde46eecd0c3954f11a4f5247d642dffde7 (patch) | |
| tree | aa4c4ac92cc275031f9bb5252103f5fc8cb7a6f0 | |
| parent | 03765883431cd9378d80882c678f3922a1cfe16e (diff) | |
header: add possible_{write,read}_pnet() on kernel >= 4.1
Upstream commit: 32cf3841b37690eaace1ad6a6582718cd9e15829
backports only adds the possible_{write,read}_pnet() functions for
kernel < 4.1. This results in a compile error on kernel 4.1. This patch
make it use the original functions on these kernel versions. This fixes
a problem introduced in 3d418885971.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
| -rw-r--r-- | backport/backport-include/net/net_namespace.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/backport/backport-include/net/net_namespace.h b/backport/backport-include/net/net_namespace.h index 90c044f1..4d0b721b 100644 --- a/backport/backport-include/net/net_namespace.h +++ b/backport/backport-include/net/net_namespace.h @@ -57,6 +57,9 @@ static inline struct net *possible_read_pnet(const possible_net_t *pnet) return &init_net; #endif } +#else +#define possible_write_pnet(pnet, net) write_pnet(pnet, net) +#define possible_read_pnet(pnet) read_pnet(pnet) #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) */ #endif /* _COMPAT_NET_NET_NAMESPACE_H */ |