diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-28 22:48:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-28 22:48:26 -0400 |
| commit | 17eed249539a7b756ca65a5cb0940abc48ef553b (patch) | |
| tree | ea8745536e7ee5aaf0d3b03e9d356979daf6bfb0 /include | |
| parent | 4ad96d39a2d74c1b2e400b602da2594f5098fc26 (diff) | |
| parent | 318a94d68979cbe9cc98a3050b4b7be2f08513c8 (diff) | |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/arcdevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h index fde675872c56..a1916078fd08 100644 --- a/include/linux/arcdevice.h +++ b/include/linux/arcdevice.h | |||
| @@ -283,8 +283,8 @@ struct arcnet_local { | |||
| 283 | int next_buf, first_free_buf; | 283 | int next_buf, first_free_buf; |
| 284 | 284 | ||
| 285 | /* network "reconfiguration" handling */ | 285 | /* network "reconfiguration" handling */ |
| 286 | time_t first_recon, /* time of "first" RECON message to count */ | 286 | unsigned long first_recon; /* time of "first" RECON message to count */ |
| 287 | last_recon; /* time of most recent RECON */ | 287 | unsigned long last_recon; /* time of most recent RECON */ |
| 288 | int num_recons; /* number of RECONs between first and last. */ | 288 | int num_recons; /* number of RECONs between first and last. */ |
| 289 | bool network_down; /* do we think the network is down? */ | 289 | bool network_down; /* do we think the network is down? */ |
| 290 | 290 | ||