]> git.openfabrics.org - ~emulex/infiniband.git/commit
ipconfig: move ic_dev_xid under IPCONFIG_BOOTP
authorFabian Frederick <fabf@skynet.be>
Wed, 9 Jul 2014 18:35:21 +0000 (20:35 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Jul 2014 21:32:54 +0000 (14:32 -0700)
commit21621e93f24b5f8de8262ace269a5f692a826bed
treed1e1ad47065be70ff78f0a23e2ba2bfeb191eee7
parentca12769748ba48fce14a3b3b47da00c3eac635d0
ipconfig: move ic_dev_xid under IPCONFIG_BOOTP

ic_dev_xid is only used in __init ic_bootp_recv under IPCONFIG_BOOTP
and __init ic_dynamic under IPCONFIG_DYNAMIC(which is itself defined
with the same IPCONFIG_BOOTP)

This patch fixes the following warning when IPCONFIG_BOOTP is not set:
>> net/ipv4/ipconfig.c:146:15: warning: 'ic_dev_xid' defined but not used [-Wunused-variable]
    static __be32 ic_dev_xid;  /* Device under configuration */

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: netdev@vger.kernel.org
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ipconfig.c