mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 19:26:25 +00:00
tulip: convert drivers to netdev_tx_t
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
3a27c149ab
commit
ad096463f7
7 changed files with 23 additions and 17 deletions
|
@ -599,7 +599,8 @@ next:
|
|||
netif_wake_queue(de->dev);
|
||||
}
|
||||
|
||||
static int de_start_xmit (struct sk_buff *skb, struct net_device *dev)
|
||||
static netdev_tx_t de_start_xmit (struct sk_buff *skb,
|
||||
struct net_device *dev)
|
||||
{
|
||||
struct de_private *de = netdev_priv(dev);
|
||||
unsigned int entry, tx_free;
|
||||
|
|
|
@ -895,7 +895,8 @@ static struct {
|
|||
** Public Functions
|
||||
*/
|
||||
static int de4x5_open(struct net_device *dev);
|
||||
static int de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev);
|
||||
static netdev_tx_t de4x5_queue_pkt(struct sk_buff *skb,
|
||||
struct net_device *dev);
|
||||
static irqreturn_t de4x5_interrupt(int irq, void *dev_id);
|
||||
static int de4x5_close(struct net_device *dev);
|
||||
static struct net_device_stats *de4x5_get_stats(struct net_device *dev);
|
||||
|
@ -1456,18 +1457,16 @@ de4x5_sw_reset(struct net_device *dev)
|
|||
/*
|
||||
** Writes a socket buffer address to the next available transmit descriptor.
|
||||
*/
|
||||
static int
|
||||
static netdev_tx_t
|
||||
de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
struct de4x5_private *lp = netdev_priv(dev);
|
||||
u_long iobase = dev->base_addr;
|
||||
int status = NETDEV_TX_OK;
|
||||
u_long flags = 0;
|
||||
|
||||
netif_stop_queue(dev);
|
||||
if (!lp->tx_enable) { /* Cannot send for now */
|
||||
if (!lp->tx_enable) /* Cannot send for now */
|
||||
return NETDEV_TX_LOCKED;
|
||||
}
|
||||
|
||||
/*
|
||||
** Clean out the TX ring asynchronously to interrupts - sometimes the
|
||||
|
@ -1521,7 +1520,7 @@ de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)
|
|||
|
||||
lp->cache.lock = 0;
|
||||
|
||||
return status;
|
||||
return NETDEV_TX_OK;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -311,7 +311,7 @@ static u8 SF_mode; /* Special Function: 1:VLAN, 2:RX Flow Control
|
|||
|
||||
/* function declaration ------------------------------------- */
|
||||
static int dmfe_open(struct DEVICE *);
|
||||
static int dmfe_start_xmit(struct sk_buff *, struct DEVICE *);
|
||||
static netdev_tx_t dmfe_start_xmit(struct sk_buff *, struct DEVICE *);
|
||||
static int dmfe_stop(struct DEVICE *);
|
||||
static void dmfe_set_filter_mode(struct DEVICE *);
|
||||
static const struct ethtool_ops netdev_ethtool_ops;
|
||||
|
@ -661,7 +661,8 @@ static void dmfe_init_dm910x(struct DEVICE *dev)
|
|||
* Send a packet to media from the upper layer.
|
||||
*/
|
||||
|
||||
static int dmfe_start_xmit(struct sk_buff *skb, struct DEVICE *dev)
|
||||
static netdev_tx_t dmfe_start_xmit(struct sk_buff *skb,
|
||||
struct DEVICE *dev)
|
||||
{
|
||||
struct dmfe_board_info *db = netdev_priv(dev);
|
||||
struct tx_desc *txptr;
|
||||
|
|
|
@ -256,7 +256,8 @@ const char tulip_media_cap[32] =
|
|||
static void tulip_tx_timeout(struct net_device *dev);
|
||||
static void tulip_init_ring(struct net_device *dev);
|
||||
static void tulip_free_ring(struct net_device *dev);
|
||||
static int tulip_start_xmit(struct sk_buff *skb, struct net_device *dev);
|
||||
static netdev_tx_t tulip_start_xmit(struct sk_buff *skb,
|
||||
struct net_device *dev);
|
||||
static int tulip_open(struct net_device *dev);
|
||||
static int tulip_close(struct net_device *dev);
|
||||
static void tulip_up(struct net_device *dev);
|
||||
|
@ -645,7 +646,7 @@ static void tulip_init_ring(struct net_device *dev)
|
|||
tp->tx_ring[i-1].buffer2 = cpu_to_le32(tp->tx_ring_dma);
|
||||
}
|
||||
|
||||
static int
|
||||
static netdev_tx_t
|
||||
tulip_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
struct tulip_private *tp = netdev_priv(dev);
|
||||
|
|
|
@ -215,7 +215,8 @@ static int mode = 8;
|
|||
|
||||
/* function declaration ------------------------------------- */
|
||||
static int uli526x_open(struct net_device *);
|
||||
static int uli526x_start_xmit(struct sk_buff *, struct net_device *);
|
||||
static netdev_tx_t uli526x_start_xmit(struct sk_buff *,
|
||||
struct net_device *);
|
||||
static int uli526x_stop(struct net_device *);
|
||||
static void uli526x_set_filter_mode(struct net_device *);
|
||||
static const struct ethtool_ops netdev_ethtool_ops;
|
||||
|
@ -567,7 +568,8 @@ static void uli526x_init(struct net_device *dev)
|
|||
* Send a packet to media from the upper layer.
|
||||
*/
|
||||
|
||||
static int uli526x_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
static netdev_tx_t uli526x_start_xmit(struct sk_buff *skb,
|
||||
struct net_device *dev)
|
||||
{
|
||||
struct uli526x_board_info *db = netdev_priv(dev);
|
||||
struct tx_desc *txptr;
|
||||
|
|
|
@ -333,7 +333,7 @@ static void init_registers(struct net_device *dev);
|
|||
static void tx_timeout(struct net_device *dev);
|
||||
static int alloc_ringdesc(struct net_device *dev);
|
||||
static void free_ringdesc(struct netdev_private *np);
|
||||
static int start_tx(struct sk_buff *skb, struct net_device *dev);
|
||||
static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev);
|
||||
static irqreturn_t intr_handler(int irq, void *dev_instance);
|
||||
static void netdev_error(struct net_device *dev, int intr_status);
|
||||
static int netdev_rx(struct net_device *dev);
|
||||
|
@ -997,7 +997,7 @@ static void free_ringdesc(struct netdev_private *np)
|
|||
|
||||
}
|
||||
|
||||
static int start_tx(struct sk_buff *skb, struct net_device *dev)
|
||||
static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
struct netdev_private *np = netdev_priv(dev);
|
||||
unsigned entry;
|
||||
|
|
|
@ -113,7 +113,8 @@ struct xircom_private {
|
|||
static int xircom_probe(struct pci_dev *pdev, const struct pci_device_id *id);
|
||||
static void xircom_remove(struct pci_dev *pdev);
|
||||
static irqreturn_t xircom_interrupt(int irq, void *dev_instance);
|
||||
static int xircom_start_xmit(struct sk_buff *skb, struct net_device *dev);
|
||||
static netdev_tx_t xircom_start_xmit(struct sk_buff *skb,
|
||||
struct net_device *dev);
|
||||
static int xircom_open(struct net_device *dev);
|
||||
static int xircom_close(struct net_device *dev);
|
||||
static void xircom_up(struct xircom_private *card);
|
||||
|
@ -384,7 +385,8 @@ static irqreturn_t xircom_interrupt(int irq, void *dev_instance)
|
|||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int xircom_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
static netdev_tx_t xircom_start_xmit(struct sk_buff *skb,
|
||||
struct net_device *dev)
|
||||
{
|
||||
struct xircom_private *card;
|
||||
unsigned long flags;
|
||||
|
|
Loading…
Reference in a new issue