Commit cd08e4da authored by Stephen Hemminger's avatar Stephen Hemminger

[PATCH] (2/4) acenic - eliminate MAX_SKB_FRAGS #if

Since MAX_SKB_FRAGS is defined in both 2.4 and 2.6, it makes sense
to eliminate this old #if code.
Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
parent e5a64e6a
......@@ -2523,10 +2523,7 @@ static int ace_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (tx_ring_full(ap, ap->tx_ret_csm, idx))
goto overflow;
#if MAX_SKB_FRAGS
if (!skb_shinfo(skb)->nr_frags)
#endif
{
if (!skb_shinfo(skb)->nr_frags) {
dma_addr_t mapping;
u32 vlan_tag = 0;
......@@ -2548,9 +2545,7 @@ static int ace_start_xmit(struct sk_buff *skb, struct net_device *dev)
flagsize |= BD_FLG_COAL_NOW;
ace_load_tx_bd(ap, desc, mapping, flagsize, vlan_tag);
}
#if MAX_SKB_FRAGS
else {
} else {
dma_addr_t mapping;
u32 vlan_tag = 0;
int i, len = 0;
......@@ -2605,7 +2600,6 @@ static int ace_start_xmit(struct sk_buff *skb, struct net_device *dev)
ace_load_tx_bd(ap, desc, mapping, flagsize, vlan_tag);
}
}
#endif
wmb();
ap->tx_prd = idx;
......
......@@ -10,11 +10,6 @@
*/
#define USE_TX_COAL_NOW 0
#ifndef MAX_SKB_FRAGS
#define MAX_SKB_FRAGS 0
#endif
/*
* Addressing:
*
......@@ -712,13 +707,7 @@ static inline int tx_space (struct ace_private *ap, u32 csm, u32 prd)
}
#define tx_free(ap) tx_space((ap)->tx_ret_csm, (ap)->tx_prd, ap)
#if MAX_SKB_FRAGS
#define tx_ring_full(ap, csm, prd) (tx_space(ap, csm, prd) <= TX_RESERVED)
#else
#define tx_ring_full 0
#endif
static inline void set_aceaddr(aceaddr *aa, dma_addr_t addr)
{
......
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