diff options
author | Fan Du <fan.du@windriver.com> | 2014-01-10 14:39:13 +0800 |
---|---|---|
committer | Steffen Klassert <steffen.klassert@secunet.com> | 2014-01-10 07:46:24 +0100 |
commit | 6bae919003602729d6f5920315bf71ca78bd9e48 (patch) | |
tree | 4c3dee0803d9f7b004580c3fee34e4a791153147 | |
parent | 5537a0557c26b1005a8f6e59125bfe3f4e51226a (diff) | |
download | op-kernel-dev-6bae919003602729d6f5920315bf71ca78bd9e48.zip op-kernel-dev-6bae919003602729d6f5920315bf71ca78bd9e48.tar.gz |
{xfrm,pktgen} Fix compiling error when CONFIG_XFRM is not set
0-DAY kernel build testing backend reported below error:
All error/warnings:
net/core/pktgen.c: In function 'pktgen_if_write':
>> >> net/core/pktgen.c:1487:10: error: 'struct pktgen_dev' has no member named 'spi'
>> >> net/core/pktgen.c:1488:43: error: 'struct pktgen_dev' has no member named 'spi'
Fix this by encapuslating the code with CONFIG_XFRM.
Cc: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Fan Du <fan.du@windriver.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
-rw-r--r-- | net/core/pktgen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index a37ec53..fa3e128 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -1482,7 +1482,7 @@ static ssize_t pktgen_if_write(struct file *file, sprintf(pg_result, "OK: flows=%u", pkt_dev->cflows); return count; } - +#ifdef CONFIG_XFRM if (!strcmp(name, "spi")) { len = num_arg(&user_buffer[i], 10, &value); if (len < 0) @@ -1493,7 +1493,7 @@ static ssize_t pktgen_if_write(struct file *file, sprintf(pg_result, "OK: spi=%u", pkt_dev->spi); return count; } - +#endif if (!strcmp(name, "flowlen")) { len = num_arg(&user_buffer[i], 10, &value); if (len < 0) |