Skip to content

Commit

Permalink
[PATCH] b44: replace B44_FLAG_INIT_COMPLETE with netif_running()
Browse files Browse the repository at this point in the history
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  • Loading branch information
Francois Romieu authored and Jeff Garzik committed Nov 9, 2005
1 parent e330562 commit b9dcbb4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
6 changes: 2 additions & 4 deletions drivers/net/b44.c
Original file line number Diff line number Diff line change
Expand Up @@ -1392,7 +1392,6 @@ static int b44_open(struct net_device *dev)

b44_init_rings(bp);
b44_init_hw(bp);
bp->flags |= B44_FLAG_INIT_COMPLETE;

netif_carrier_off(dev);
b44_check_phy(bp);
Expand Down Expand Up @@ -1456,7 +1455,6 @@ static int b44_close(struct net_device *dev)
#endif
b44_halt(bp);
b44_free_rings(bp);
bp->flags &= ~B44_FLAG_INIT_COMPLETE;
netif_carrier_off(bp->dev);

spin_unlock_irq(&bp->lock);
Expand Down Expand Up @@ -1608,7 +1606,7 @@ static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
struct b44 *bp = netdev_priv(dev);

if (!(bp->flags & B44_FLAG_INIT_COMPLETE))
if (!netif_running(dev))
return -EAGAIN;
cmd->supported = (SUPPORTED_Autoneg);
cmd->supported |= (SUPPORTED_100baseT_Half |
Expand Down Expand Up @@ -1646,7 +1644,7 @@ static int b44_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{
struct b44 *bp = netdev_priv(dev);

if (!(bp->flags & B44_FLAG_INIT_COMPLETE))
if (!netif_running(dev))
return -EAGAIN;

/* We do not support gigabit. */
Expand Down
1 change: 0 additions & 1 deletion drivers/net/b44.h
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,6 @@ struct b44 {

u32 dma_offset;
u32 flags;
#define B44_FLAG_INIT_COMPLETE 0x00000001
#define B44_FLAG_BUGGY_TXPTR 0x00000002
#define B44_FLAG_REORDER_BUG 0x00000004
#define B44_FLAG_PAUSE_AUTO 0x00008000
Expand Down

0 comments on commit b9dcbb4

Please sign in to comment.