2014-07-09 18:35:31

by Fabian Frédérick

Subject: [PATCH 1/1 net-next] 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 <[email protected]>
Cc: Fengguang Wu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Alexey Kuznetsov <[email protected]>
Cc: [email protected]
Signed-off-by: Fabian Frederick <[email protected]>
---
net/ipv4/ipconfig.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index f0f3f9f..f02f594 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -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.
--
1.9.1

2014-07-09 21:33:16

by David Miller

Subject: Re: [PATCH 1/1 net-next] ipconfig: move ic_dev_xid under IPCONFIG_BOOTP

From: Fabian Frederick <[email protected]>
Date: Wed, 9 Jul 2014 20:35:21 +0200

> 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 <[email protected]>
> Cc: Fengguang Wu <[email protected]>
> Cc: "David S. Miller" <[email protected]>
> Cc: Alexey Kuznetsov <[email protected]>
> Cc: [email protected]
> Signed-off-by: Fabian Frederick <[email protected]>

Applied, thank you.