aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cassini.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/cassini.c')
-rw-r--r--drivers/net/cassini.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index eb066673c2a0..299a33b914f8 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -2928,7 +2928,7 @@ static int cas_start_xmit(struct sk_buff *skb, struct net_device *dev)
2928 static int ring; 2928 static int ring;
2929 2929
2930 if (skb_padto(skb, cp->min_frame_size)) 2930 if (skb_padto(skb, cp->min_frame_size))
2931 return 0; 2931 return NETDEV_TX_OK;
2932 2932
2933 /* XXX: we need some higher-level QoS hooks to steer packets to 2933 /* XXX: we need some higher-level QoS hooks to steer packets to
2934 * individual queues. 2934 * individual queues.
@@ -2936,7 +2936,7 @@ static int cas_start_xmit(struct sk_buff *skb, struct net_device *dev)
2936 if (cas_xmit_tx_ringN(cp, ring++ & N_TX_RINGS_MASK, skb)) 2936 if (cas_xmit_tx_ringN(cp, ring++ & N_TX_RINGS_MASK, skb))
2937 return NETDEV_TX_BUSY; 2937 return NETDEV_TX_BUSY;
2938 dev->trans_start = jiffies; 2938 dev->trans_start = jiffies;
2939 return 0; 2939 return NETDEV_TX_OK;
2940} 2940}
2941 2941
2942static void cas_init_tx_dma(struct cas *cp) 2942static void cas_init_tx_dma(struct cas *cp)