mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

tulip: convert drivers to netdev_tx_t

Browse source 
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger 2009-08-31 19:50:53 +00:00 committed by David S. Miller
parent 3a27c149ab
commit ad096463f7
7 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/tulip/de2104x.c
View file

@ -599,7 +599,8 @@ static void de_tx (struct de_private *de)
netif_wake_queue(de->dev); 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); struct de_private *de = netdev_priv(dev);
unsigned int entry, tx_free; unsigned int entry, tx_free;

11
drivers/net/tulip/de4x5.c
View file

@ -895,7 +895,8 @@ static struct {
** Public Functions ** Public Functions
*/ */
static int de4x5_open(struct net_device *dev); 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 irqreturn_t de4x5_interrupt(int irq, void *dev_id);
static int de4x5_close(struct net_device *dev); static int de4x5_close(struct net_device *dev);
static struct net_device_stats *de4x5_get_stats(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. ** 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) de4x5_queue_pkt(struct sk_buff *skb, struct net_device *dev)
{ {
struct de4x5_private *lp = netdev_priv(dev); struct de4x5_private *lp = netdev_priv(dev);
u_long iobase = dev->base_addr; u_long iobase = dev->base_addr;
int status = NETDEV_TX_OK;
u_long flags = 0; u_long flags = 0;
netif_stop_queue(dev); netif_stop_queue(dev);
if (!lp->tx_enable) { /* Cannot send for now */ if (!lp->tx_enable) /* Cannot send for now */
return NETDEV_TX_LOCKED; return NETDEV_TX_LOCKED;
}
/* /*
** Clean out the TX ring asynchronously to interrupts - sometimes the ** 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; lp->cache.lock = 0;
return status; return NETDEV_TX_OK;
} }
/* /*

5
drivers/net/tulip/dmfe.c
View file

@ -311,7 +311,7 @@ static u8 SF_mode; /* Special Function: 1:VLAN, 2:RX Flow Control
/* function declaration ------------------------------------- */ /* function declaration ------------------------------------- */
static int dmfe_open(struct DEVICE *); 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 int dmfe_stop(struct DEVICE *);
static void dmfe_set_filter_mode(struct DEVICE *); static void dmfe_set_filter_mode(struct DEVICE *);
static const struct ethtool_ops netdev_ethtool_ops; 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. * 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 dmfe_board_info *db = netdev_priv(dev);
struct tx_desc *txptr; struct tx_desc *txptr;

5
drivers/net/tulip/tulip_core.c
View file

@ -256,7 +256,8 @@ const char tulip_media_cap[32] =
static void tulip_tx_timeout(struct net_device *dev); static void tulip_tx_timeout(struct net_device *dev);
static void tulip_init_ring(struct net_device *dev); static void tulip_init_ring(struct net_device *dev);
static void tulip_free_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_open(struct net_device *dev);
static int tulip_close(struct net_device *dev); static int tulip_close(struct net_device *dev);
static void tulip_up(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); 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) tulip_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct tulip_private *tp = netdev_priv(dev); struct tulip_private *tp = netdev_priv(dev);

6
drivers/net/tulip/uli526x.c
View file

@ -215,7 +215,8 @@ static int mode = 8;
/* function declaration ------------------------------------- */ /* function declaration ------------------------------------- */
static int uli526x_open(struct net_device *); 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 int uli526x_stop(struct net_device *);
static void uli526x_set_filter_mode(struct net_device *); static void uli526x_set_filter_mode(struct net_device *);
static const struct ethtool_ops netdev_ethtool_ops; 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. * 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 uli526x_board_info *db = netdev_priv(dev);
struct tx_desc *txptr; struct tx_desc *txptr;

4
drivers/net/tulip/winbond-840.c
View file

@ -333,7 +333,7 @@ static void init_registers(struct net_device *dev);
static void tx_timeout(struct net_device *dev); static void tx_timeout(struct net_device *dev);
static int alloc_ringdesc(struct net_device *dev); static int alloc_ringdesc(struct net_device *dev);
static void free_ringdesc(struct netdev_private *np); 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 irqreturn_t intr_handler(int irq, void *dev_instance);
static void netdev_error(struct net_device *dev, int intr_status); static void netdev_error(struct net_device *dev, int intr_status);
static int netdev_rx(struct net_device *dev); 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); struct netdev_private *np = netdev_priv(dev);
unsigned entry; unsigned entry;

6
drivers/net/tulip/xircom_cb.c
View file

@ -113,7 +113,8 @@ struct xircom_private {
static int xircom_probe(struct pci_dev *pdev, const struct pci_device_id *id); static int xircom_probe(struct pci_dev *pdev, const struct pci_device_id *id);
static void xircom_remove(struct pci_dev *pdev); static void xircom_remove(struct pci_dev *pdev);
static irqreturn_t xircom_interrupt(int irq, void *dev_instance); 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_open(struct net_device *dev);
static int xircom_close(struct net_device *dev); static int xircom_close(struct net_device *dev);
static void xircom_up(struct xircom_private *card); 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; 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; struct xircom_private *card;
unsigned long flags; unsigned long flags;