diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-18 01:01:30 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-18 01:01:30 +0300 |
| commit | 2d6a5e9500103680464a723a4564961675652680 (patch) | |
| tree | d18903333aae8a4415b179d6e7d38f203724892c /drivers/net/mv643xx_eth.c | |
| parent | bd257ed9f1d129b4e881f513a406b435c8852565 (diff) | |
| parent | f10023a4ef3f5cc05457b059c6880bc447adfa1f (diff) | |
| download | linux-2d6a5e9500103680464a723a4564961675652680.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/igb/igb_main.c
drivers/net/qlge/qlge_main.c
drivers/net/wireless/ath9k/ath9k.h
drivers/net/wireless/ath9k/core.h
drivers/net/wireless/ath9k/hw.c
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
| -rw-r--r-- | drivers/net/mv643xx_eth.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index e1f7706c15cd..a56d9d2df73f 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c @@ -2289,11 +2289,6 @@ static void port_start(struct mv643xx_eth_private *mp) } /* - * Add configured unicast address to address filter table. - */ - mv643xx_eth_program_unicast_filter(mp->dev); - - /* * Receive all unmatched unicast, TCP, UDP, BPDU and broadcast * frames to RX queue #0, and include the pseudo-header when * calculating receive checksums. @@ -2306,6 +2301,11 @@ static void port_start(struct mv643xx_eth_private *mp) wrlp(mp, PORT_CONFIG_EXT, 0x00000000); /* + * Add configured unicast addresses to address filter table. + */ + mv643xx_eth_program_unicast_filter(mp->dev); + + /* * Enable the receive queues. */ for (i = 0; i < mp->rxq_count; i++) { |