diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-27 03:54:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-27 03:54:45 -0700 |
| commit | df69471290cbec7714f6d1fabd14f4e41219cee1 (patch) | |
| tree | 1a8d9d3fce98db7b4382c24994feba6fa771805f /drivers/net/fs_enet/fs_enet-main.c | |
| parent | d994af0d50efc96b2077978fe9f066992639d525 (diff) | |
| parent | 17393dd67c06c3912ff47b31268b648929715336 (diff) | |
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/fs_enet/fs_enet-main.c')
| -rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index 9a51ec8293c..9d461825bf4 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c @@ -792,6 +792,10 @@ static int fs_enet_open(struct net_device *dev) int r; int err; + /* to initialize the fep->cur_rx,... */ + /* not doing this, will cause a crash in fs_enet_rx_napi */ + fs_init_bds(fep->ndev); + if (fep->fpi->use_napi) napi_enable(&fep->napi); @@ -1167,6 +1171,10 @@ static struct of_device_id fs_enet_match[] = { .compatible = "fsl,cpm1-scc-enet", .data = (void *)&fs_scc_ops, }, + { + .compatible = "fsl,cpm2-scc-enet", + .data = (void *)&fs_scc_ops, + }, #endif #ifdef CONFIG_FS_ENET_HAS_FCC { |