Commit 2a54adc3 authored by Scott Wood's avatar Scott Wood Committed by Jeff Garzik

gianfar: Call gfar_halt_nodisable() from gfar_halt().

gfar_halt() was factored out into halting and disabling by commit
d87eb127, as the suspend() method
only wants to do the former.  However, the call to gfar_halt_nodisable()
from gfar_halt() apparently got lost during the patch respin process.

This adds it back.
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent fde9403a
...@@ -134,9 +134,7 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, int l ...@@ -134,9 +134,7 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, int l
static void gfar_vlan_rx_register(struct net_device *netdev, static void gfar_vlan_rx_register(struct net_device *netdev,
struct vlan_group *grp); struct vlan_group *grp);
void gfar_halt(struct net_device *dev); void gfar_halt(struct net_device *dev);
#ifdef CONFIG_PM
static void gfar_halt_nodisable(struct net_device *dev); static void gfar_halt_nodisable(struct net_device *dev);
#endif
void gfar_start(struct net_device *dev); void gfar_start(struct net_device *dev);
static void gfar_clear_exact_match(struct net_device *dev); static void gfar_clear_exact_match(struct net_device *dev);
static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr); static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr);
...@@ -631,7 +629,6 @@ static void init_registers(struct net_device *dev) ...@@ -631,7 +629,6 @@ static void init_registers(struct net_device *dev)
} }
#ifdef CONFIG_PM
/* Halt the receive and transmit queues */ /* Halt the receive and transmit queues */
static void gfar_halt_nodisable(struct net_device *dev) static void gfar_halt_nodisable(struct net_device *dev)
{ {
...@@ -657,7 +654,6 @@ static void gfar_halt_nodisable(struct net_device *dev) ...@@ -657,7 +654,6 @@ static void gfar_halt_nodisable(struct net_device *dev)
cpu_relax(); cpu_relax();
} }
} }
#endif
/* Halt the receive and transmit queues */ /* Halt the receive and transmit queues */
void gfar_halt(struct net_device *dev) void gfar_halt(struct net_device *dev)
...@@ -666,6 +662,8 @@ void gfar_halt(struct net_device *dev) ...@@ -666,6 +662,8 @@ void gfar_halt(struct net_device *dev)
struct gfar __iomem *regs = priv->regs; struct gfar __iomem *regs = priv->regs;
u32 tempval; u32 tempval;
gfar_halt_nodisable(dev);
/* Disable Rx and Tx */ /* Disable Rx and Tx */
tempval = gfar_read(&regs->maccfg1); tempval = gfar_read(&regs->maccfg1);
tempval &= ~(MACCFG1_RX_EN | MACCFG1_TX_EN); tempval &= ~(MACCFG1_RX_EN | MACCFG1_TX_EN);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment