Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 12:21:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] b44: replace B44_FLAG_INIT_COMPLETE with netif_running()

Browse Source 
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Francois Romieu 2005-11-08 23:36:20 +01:00 committed by Jeff Garzik
parent e3305626e0
commit b9dcbb40f4
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/b44.c
View File

@ -1392,7 +1392,6 @@ static int b44_open(struct net_device *dev)
b44_init_rings(bp); b44_init_rings(bp);
b44_init_hw(bp); b44_init_hw(bp);
bp->flags |= B44_FLAG_INIT_COMPLETE;
netif_carrier_off(dev); netif_carrier_off(dev);
b44_check_phy(bp); b44_check_phy(bp);
@ -1456,7 +1455,6 @@ static int b44_close(struct net_device *dev)
#endif #endif
b44_halt(bp); b44_halt(bp);
b44_free_rings(bp); b44_free_rings(bp);
bp->flags &= ~B44_FLAG_INIT_COMPLETE;
netif_carrier_off(bp->dev); netif_carrier_off(bp->dev);
spin_unlock_irq(&bp->lock); spin_unlock_irq(&bp->lock);
@ -1608,7 +1606,7 @@ static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{ {
struct b44 *bp = netdev_priv(dev); struct b44 *bp = netdev_priv(dev);
if (!(bp->flags & B44_FLAG_INIT_COMPLETE)) if (!netif_running(dev))
return -EAGAIN; return -EAGAIN;
cmd->supported = (SUPPORTED_Autoneg); cmd->supported = (SUPPORTED_Autoneg);
cmd->supported |= (SUPPORTED_100baseT_Half | cmd->supported |= (SUPPORTED_100baseT_Half |
@ -1646,7 +1644,7 @@ static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{ {
struct b44 *bp = netdev_priv(dev); struct b44 *bp = netdev_priv(dev);
if (!(bp->flags & B44_FLAG_INIT_COMPLETE)) if (!netif_running(dev))
return -EAGAIN; return -EAGAIN;
/* We do not support gigabit. */ /* We do not support gigabit. */

1
drivers/net/b44.h
View File

@ -420,7 +420,6 @@ struct b44 {
u32 dma_offset; u32 dma_offset;
u32 flags; u32 flags;
#define B44_FLAG_INIT_COMPLETE 0x00000001
#define B44_FLAG_BUGGY_TXPTR 0x00000002 #define B44_FLAG_BUGGY_TXPTR 0x00000002
#define B44_FLAG_REORDER_BUG 0x00000004 #define B44_FLAG_REORDER_BUG 0x00000004
#define B44_FLAG_PAUSE_AUTO 0x00008000 #define B44_FLAG_PAUSE_AUTO 0x00008000