diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-07-09 14:35:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-09 17:32:54 -0400 |
commit | 21621e93f24b5f8de8262ace269a5f692a826bed (patch) | |
tree | d1e1ad47065be70ff78f0a23e2ba2bfeb191eee7 /net/ipv4/ipconfig.c | |
parent | ca12769748ba48fce14a3b3b47da00c3eac635d0 (diff) |
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>
Diffstat (limited to 'net/ipv4/ipconfig.c')
-rw-r--r-- | net/ipv4/ipconfig.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index f0f3f9f77b30..f02f594d04c5 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c | |||
@@ -143,8 +143,6 @@ __be32 ic_servaddr = NONE; /* Boot server IP address */ | |||
143 | __be32 root_server_addr = NONE; /* Address of NFS server */ | 143 | __be32 root_server_addr = NONE; /* Address of NFS server */ |
144 | u8 root_server_path[256] = { 0, }; /* Path to mount as root */ | 144 | u8 root_server_path[256] = { 0, }; /* Path to mount as root */ |
145 | 145 | ||
146 | static __be32 ic_dev_xid; /* Device under configuration */ | ||
147 | |||
148 | /* vendor class identifier */ | 146 | /* vendor class identifier */ |
149 | static char vendor_class_identifier[253] __initdata; | 147 | static char vendor_class_identifier[253] __initdata; |
150 | 148 | ||
@@ -654,6 +652,7 @@ static struct packet_type bootp_packet_type __initdata = { | |||
654 | .func = ic_bootp_recv, | 652 | .func = ic_bootp_recv, |
655 | }; | 653 | }; |
656 | 654 | ||
655 | static __be32 ic_dev_xid; /* Device under configuration */ | ||
657 | 656 | ||
658 | /* | 657 | /* |
659 | * Initialize DHCP/BOOTP extension fields in the request. | 658 | * Initialize DHCP/BOOTP extension fields in the request. |