summaryrefslogtreecommitdiffstats
path: root/drivers/net/mv643xx_eth.h
diff options
context:
space:
mode:
authorDale Farnsworth <dale@farnsworth.org>2005-09-02 12:36:48 -0700
committerJeff Garzik <jgarzik@pobox.com>2005-09-05 18:08:30 -0400
commit7342cd810cfd73120687d5323846e5c114cb23bb (patch)
tree60106923617dae852111129609bc68e6b4be3aeb /drivers/net/mv643xx_eth.h
parent8f543718ea1c20795853bf065f1dcb510f210465 (diff)
downloadlinux-7342cd810cfd73120687d5323846e5c114cb23bb.tar.gz
linux-7342cd810cfd73120687d5323846e5c114cb23bb.tar.bz2
linux-7342cd810cfd73120687d5323846e5c114cb23bb.zip
[PATCH] mv643xx: Fix promiscuous mode handling
mv643xx_eth_get_config_reg() was reading the wrong register. mv643xx_eth_set_config_reg() was or'ing instead of setting the register. These functions are trivial and both are called only from mv643xx_eth_set_rx_mode() when changing to/from promiscuous mode. Remove both functions and do the operations directly in mv643xx_eth_set_rx_mode(). Also, maintain promiscuous mode setting across port resets. Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/mv643xx_eth.h')
-rw-r--r--drivers/net/mv643xx_eth.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/mv643xx_eth.h b/drivers/net/mv643xx_eth.h
index 7678b59c2952..bcfda5192da0 100644
--- a/drivers/net/mv643xx_eth.h
+++ b/drivers/net/mv643xx_eth.h
@@ -408,10 +408,6 @@ static void eth_port_init(struct mv643xx_private *mp);
static void eth_port_reset(unsigned int eth_port_num);
static void eth_port_start(struct mv643xx_private *mp);
-static void ethernet_set_config_reg(unsigned int eth_port_num,
- unsigned int value);
-static unsigned int ethernet_get_config_reg(unsigned int eth_port_num);
-
/* Port MAC address routines */
static void eth_port_uc_addr_set(unsigned int eth_port_num,
unsigned char *p_addr);