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>
This commit is contained in:
Родитель
ca12769748
Коммит
21621e93f2
|
@ -143,8 +143,6 @@ __be32 ic_servaddr = NONE; /* Boot server IP address */
|
|||
__be32 root_server_addr = NONE; /* Address of NFS server */
|
||||
u8 root_server_path[256] = { 0, }; /* Path to mount as root */
|
||||
|
||||
static __be32 ic_dev_xid; /* Device under configuration */
|
||||
|
||||
/* vendor class identifier */
|
||||
static char vendor_class_identifier[253] __initdata;
|
||||
|
||||
|
@ -654,6 +652,7 @@ static struct packet_type bootp_packet_type __initdata = {
|
|||
.func = ic_bootp_recv,
|
||||
};
|
||||
|
||||
static __be32 ic_dev_xid; /* Device under configuration */
|
||||
|
||||
/*
|
||||
* Initialize DHCP/BOOTP extension fields in the request.
|
||||
|
|
Загрузка…
Ссылка в новой задаче