diff options
Diffstat (limited to 'drivers/net/ucc_geth.c')
-rw-r--r-- | drivers/net/ucc_geth.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 1a16ab20b39e..60844a6f4928 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
@@ -1626,14 +1626,6 @@ static int init_phy(struct net_device *dev) | |||
1626 | } | 1626 | } |
1627 | 1627 | ||
1628 | 1628 | ||
1629 | #ifdef CONFIG_UGETH_TX_ON_DEMOND | ||
1630 | static int ugeth_transmit_on_demand(struct ucc_geth_private *ugeth) | ||
1631 | { | ||
1632 | struct ucc_fastransmit_on_demand(ugeth->uccf); | ||
1633 | |||
1634 | return 0; | ||
1635 | } | ||
1636 | #endif | ||
1637 | 1629 | ||
1638 | static int ugeth_graceful_stop_tx(struct ucc_geth_private *ugeth) | 1630 | static int ugeth_graceful_stop_tx(struct ucc_geth_private *ugeth) |
1639 | { | 1631 | { |
@@ -3343,6 +3335,9 @@ static void ucc_geth_timeout(struct net_device *dev) | |||
3343 | static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) | 3335 | static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) |
3344 | { | 3336 | { |
3345 | struct ucc_geth_private *ugeth = netdev_priv(dev); | 3337 | struct ucc_geth_private *ugeth = netdev_priv(dev); |
3338 | #ifdef CONFIG_UGETH_TX_ON_DEMAND | ||
3339 | struct ucc_fast_private *uccf; | ||
3340 | #endif | ||
3346 | u8 *bd; /* BD pointer */ | 3341 | u8 *bd; /* BD pointer */ |
3347 | u32 bd_status; | 3342 | u32 bd_status; |
3348 | u8 txQ = 0; | 3343 | u8 txQ = 0; |
@@ -3401,6 +3396,10 @@ static int ucc_geth_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
3401 | out_be16(ugeth->p_cpucount[txQ], ugeth->cpucount[txQ]); | 3396 | out_be16(ugeth->p_cpucount[txQ], ugeth->cpucount[txQ]); |
3402 | } | 3397 | } |
3403 | 3398 | ||
3399 | #ifdef CONFIG_UGETH_TX_ON_DEMAND | ||
3400 | uccf = ugeth->uccf; | ||
3401 | out_be16(uccf->p_utodr, UCC_FAST_TOD); | ||
3402 | #endif | ||
3404 | spin_unlock_irq(&ugeth->lock); | 3403 | spin_unlock_irq(&ugeth->lock); |
3405 | 3404 | ||
3406 | return 0; | 3405 | return 0; |