diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-11-04 14:37:46 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-04 15:09:52 -0500 |
commit | 0d3979b9c711bf823d65e8abe9ab2e8bff0669fa (patch) | |
tree | 3bc5f6c03240e386b34f55d71bbc7b0682365e05 | |
parent | c9f503b00622525bb9a549ff38c4bb20b4287b84 (diff) |
ipv4: remove 0/NULL assignment on static
static values are automatically initialized to 0
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv4/ipconfig.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index a896da50f398..7fa18bc7e47f 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c | |||
@@ -115,7 +115,7 @@ | |||
115 | */ | 115 | */ |
116 | int ic_set_manually __initdata = 0; /* IPconfig parameters set manually */ | 116 | int ic_set_manually __initdata = 0; /* IPconfig parameters set manually */ |
117 | 117 | ||
118 | static int ic_enable __initdata = 0; /* IP config enabled? */ | 118 | static int ic_enable __initdata; /* IP config enabled? */ |
119 | 119 | ||
120 | /* Protocol choice */ | 120 | /* Protocol choice */ |
121 | int ic_proto_enabled __initdata = 0 | 121 | int ic_proto_enabled __initdata = 0 |
@@ -130,7 +130,7 @@ int ic_proto_enabled __initdata = 0 | |||
130 | #endif | 130 | #endif |
131 | ; | 131 | ; |
132 | 132 | ||
133 | static int ic_host_name_set __initdata = 0; /* Host name set by us? */ | 133 | static int ic_host_name_set __initdata; /* Host name set by us? */ |
134 | 134 | ||
135 | __be32 ic_myaddr = NONE; /* My IP address */ | 135 | __be32 ic_myaddr = NONE; /* My IP address */ |
136 | static __be32 ic_netmask = NONE; /* Netmask for local subnet */ | 136 | static __be32 ic_netmask = NONE; /* Netmask for local subnet */ |
@@ -160,17 +160,17 @@ static u8 ic_domain[64]; /* DNS (not NIS) domain name */ | |||
160 | static char user_dev_name[IFNAMSIZ] __initdata = { 0, }; | 160 | static char user_dev_name[IFNAMSIZ] __initdata = { 0, }; |
161 | 161 | ||
162 | /* Protocols supported by available interfaces */ | 162 | /* Protocols supported by available interfaces */ |
163 | static int ic_proto_have_if __initdata = 0; | 163 | static int ic_proto_have_if __initdata; |
164 | 164 | ||
165 | /* MTU for boot device */ | 165 | /* MTU for boot device */ |
166 | static int ic_dev_mtu __initdata = 0; | 166 | static int ic_dev_mtu __initdata; |
167 | 167 | ||
168 | #ifdef IPCONFIG_DYNAMIC | 168 | #ifdef IPCONFIG_DYNAMIC |
169 | static DEFINE_SPINLOCK(ic_recv_lock); | 169 | static DEFINE_SPINLOCK(ic_recv_lock); |
170 | static volatile int ic_got_reply __initdata = 0; /* Proto(s) that replied */ | 170 | static volatile int ic_got_reply __initdata; /* Proto(s) that replied */ |
171 | #endif | 171 | #endif |
172 | #ifdef IPCONFIG_DHCP | 172 | #ifdef IPCONFIG_DHCP |
173 | static int ic_dhcp_msgtype __initdata = 0; /* DHCP msg type received */ | 173 | static int ic_dhcp_msgtype __initdata; /* DHCP msg type received */ |
174 | #endif | 174 | #endif |
175 | 175 | ||
176 | 176 | ||
@@ -186,8 +186,8 @@ struct ic_device { | |||
186 | __be32 xid; | 186 | __be32 xid; |
187 | }; | 187 | }; |
188 | 188 | ||
189 | static struct ic_device *ic_first_dev __initdata = NULL;/* List of open device */ | 189 | static struct ic_device *ic_first_dev __initdata; /* List of open device */ |
190 | static struct net_device *ic_dev __initdata = NULL; /* Selected device */ | 190 | static struct net_device *ic_dev __initdata; /* Selected device */ |
191 | 191 | ||
192 | static bool __init ic_is_init_dev(struct net_device *dev) | 192 | static bool __init ic_is_init_dev(struct net_device *dev) |
193 | { | 193 | { |