Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 130495
b: refs/heads/master
c: 9d8dba6
h: refs/heads/master
i:
  130493: 447cad7
  130491: a09c912
  130487: 339dfd6
  130479: 51ff7a6
  130463: bcd2f0e
  130431: bc30172
v: v3
  • Loading branch information
Benjamin Zores authored and David S. Miller committed Jan 30, 2009
1 parent 9a76e28 commit c9f92b8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 58092d1e0a896eb1d9163d58f93df7ed704fa8e1
refs/heads/master: 9d8dba6c979fa99c96938c869611b9a23b73efa9
6 changes: 3 additions & 3 deletions trunk/net/ipv4/ipconfig.c
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,9 @@ __be32 __init root_nfs_parse_addr(char *name)
static int __init ip_auto_config(void)
{
__be32 addr;
#ifdef IPCONFIG_DYNAMIC
int retries = CONF_OPEN_RETRIES;
#endif

#ifdef CONFIG_PROC_FS
proc_net_fops_create(&init_net, "pnp", S_IRUGO, &pnp_seq_fops);
Expand Down Expand Up @@ -1304,9 +1307,6 @@ static int __init ip_auto_config(void)
#endif
ic_first_dev->next) {
#ifdef IPCONFIG_DYNAMIC

int retries = CONF_OPEN_RETRIES;

if (ic_dynamic() < 0) {
ic_close_devs();

Expand Down

0 comments on commit c9f92b8

Please sign in to comment.