diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 17:52:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 17:52:52 -0400 |
| commit | 32ea89ecb25789b1b7db28146558587a42f3b372 (patch) | |
| tree | c5b3b33523b353f2eab2d8dcd2b3f069826cdc48 /drivers/net/eql.c | |
| parent | 58a7ce64426394a46e80cdc9440cc1e7c195e85d (diff) | |
| parent | a145410dccdb44f81d3b56763ef9b6f721f4e47c (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/eql.c')
| -rw-r--r-- | drivers/net/eql.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/eql.c b/drivers/net/eql.c index aa1569182fd6..815436c6170f 100644 --- a/drivers/net/eql.c +++ b/drivers/net/eql.c | |||
| @@ -203,8 +203,7 @@ static int eql_open(struct net_device *dev) | |||
| 203 | printk(KERN_INFO "%s: remember to turn off Van-Jacobson compression on " | 203 | printk(KERN_INFO "%s: remember to turn off Van-Jacobson compression on " |
| 204 | "your slave devices.\n", dev->name); | 204 | "your slave devices.\n", dev->name); |
| 205 | 205 | ||
| 206 | if (!list_empty(&eql->queue.all_slaves)) | 206 | BUG_ON(!list_empty(&eql->queue.all_slaves)); |
| 207 | BUG(); | ||
| 208 | 207 | ||
| 209 | eql->min_slaves = 1; | 208 | eql->min_slaves = 1; |
| 210 | eql->max_slaves = EQL_DEFAULT_MAX_SLAVES; /* 4 usually... */ | 209 | eql->max_slaves = EQL_DEFAULT_MAX_SLAVES; /* 4 usually... */ |