adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

wan: 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:47 +00:00 committed by David S. Miller
parent 61a8410854
commit d71a674922
21 changed files with 57 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/net/wan/cosa.c
View file

@ -279,7 +279,7 @@ static int cosa_net_attach(struct net_device *dev, unsigned short encoding,
static int cosa_net_open(struct net_device *d); static int cosa_net_open(struct net_device *d);
static int cosa_net_close(struct net_device *d); static int cosa_net_close(struct net_device *d);
static void cosa_net_timeout(struct net_device *d); static void cosa_net_timeout(struct net_device *d);
static int cosa_net_tx(struct sk_buff *skb, struct net_device *d); static netdev_tx_t cosa_net_tx(struct sk_buff *skb, struct net_device *d);
static char *cosa_net_setup_rx(struct channel_data *channel, int size); static char *cosa_net_setup_rx(struct channel_data *channel, int size);
static int cosa_net_rx_done(struct channel_data *channel); static int cosa_net_rx_done(struct channel_data *channel);
static int cosa_net_tx_done(struct channel_data *channel, int size); static int cosa_net_tx_done(struct channel_data *channel, int size);
@ -672,7 +672,8 @@ static int cosa_net_open(struct net_device *dev)
return 0; return 0;
} }
static int cosa_net_tx(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t cosa_net_tx(struct sk_buff *skb,
struct net_device *dev)
{ {
struct channel_data *chan = dev_to_chan(dev); struct channel_data *chan = dev_to_chan(dev);
@ -680,7 +681,7 @@ static int cosa_net_tx(struct sk_buff *skb, struct net_device *dev)
chan->tx_skb = skb; chan->tx_skb = skb;
cosa_start_tx(chan, skb->data, skb->len); cosa_start_tx(chan, skb->data, skb->len);
return 0; return NETDEV_TX_OK;
} }
static void cosa_net_timeout(struct net_device *dev) static void cosa_net_timeout(struct net_device *dev)

4
drivers/net/wan/cycx_x25.c
View file

@ -139,7 +139,7 @@ static int cycx_netdevice_hard_header(struct sk_buff *skb,
const void *daddr, const void *saddr, const void *daddr, const void *saddr,
unsigned len); unsigned len);
static int cycx_netdevice_rebuild_header(struct sk_buff *skb); static int cycx_netdevice_rebuild_header(struct sk_buff *skb);
static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb, static netdev_tx_t cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
struct net_device *dev); struct net_device *dev);
static struct net_device_stats * static struct net_device_stats *
@ -593,7 +593,7 @@ static int cycx_netdevice_rebuild_header(struct sk_buff *skb)
* bottom half" (with interrupts enabled). * bottom half" (with interrupts enabled).
* 2. Setting tbusy flag will inhibit further transmit requests from the * 2. Setting tbusy flag will inhibit further transmit requests from the
* protocol stack and can be used for flow control with protocol layer. */ * protocol stack and can be used for flow control with protocol layer. */
static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb, static netdev_tx_t cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
struct net_device *dev) struct net_device *dev)
{ {
struct cycx_x25_channel *chan = netdev_priv(dev); struct cycx_x25_channel *chan = netdev_priv(dev);

9
drivers/net/wan/dlci.c
View file

@ -186,12 +186,11 @@ static void dlci_receive(struct sk_buff *skb, struct net_device *dev)
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
static int dlci_transmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t dlci_transmit(struct sk_buff *skb,
struct net_device *dev)
{ {
struct dlci_local *dlp; struct dlci_local *dlp;
int ret; netdev_tx_t ret;
ret = 0;
if (!skb || !dev) if (!skb || !dev)
return NETDEV_TX_OK; return NETDEV_TX_OK;
@ -200,6 +199,8 @@ static int dlci_transmit(struct sk_buff *skb, struct net_device *dev)
netif_stop_queue(dev); netif_stop_queue(dev);
/* This is hackish, overloads driver specific return values
on top of normal transmit return! */
ret = dlp->slave->netdev_ops->ndo_start_xmit(skb, dlp->slave); ret = dlp->slave->netdev_ops->ndo_start_xmit(skb, dlp->slave);
switch (ret) switch (ret)
{ {

6
drivers/net/wan/dscc4.c
View file

@ -359,7 +359,8 @@ static void dscc4_tx_irq(struct dscc4_pci_priv *, struct dscc4_dev_priv *);
static int dscc4_found1(struct pci_dev *, void __iomem *ioaddr); static int dscc4_found1(struct pci_dev *, void __iomem *ioaddr);
static int dscc4_init_one(struct pci_dev *, const struct pci_device_id *ent); static int dscc4_init_one(struct pci_dev *, const struct pci_device_id *ent);
static int dscc4_open(struct net_device *); static int dscc4_open(struct net_device *);
static int dscc4_start_xmit(struct sk_buff *, struct net_device *); static netdev_tx_t dscc4_start_xmit(struct sk_buff *,
struct net_device *);
static int dscc4_close(struct net_device *); static int dscc4_close(struct net_device *);
static int dscc4_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); static int dscc4_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
static int dscc4_init_ring(struct net_device *); static int dscc4_init_ring(struct net_device *);
@ -1148,7 +1149,8 @@ static int dscc4_tx_poll(struct dscc4_dev_priv *dpriv, struct net_device *dev)
} }
#endif /* DSCC4_POLLING */ #endif /* DSCC4_POLLING */
static int dscc4_start_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t dscc4_start_xmit(struct sk_buff *skb,
struct net_device *dev)
{ {
struct dscc4_dev_priv *dpriv = dscc4_priv(dev); struct dscc4_dev_priv *dpriv = dscc4_priv(dev);
struct dscc4_pci_priv *ppriv = dpriv->pci_priv; struct dscc4_pci_priv *ppriv = dpriv->pci_priv;

2
drivers/net/wan/farsync.c
View file

@ -2274,7 +2274,7 @@ fst_tx_timeout(struct net_device *dev)
port->start = 0; port->start = 0;
} }
static int static netdev_tx_t
fst_start_xmit(struct sk_buff *skb, struct net_device *dev) fst_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct fst_card_info *card; struct fst_card_info *card;

4
drivers/net/wan/hd64570.c
View file

@ -620,7 +620,7 @@ static void sca_dump_rings(struct net_device *dev)
#endif /* DEBUG_RINGS */ #endif /* DEBUG_RINGS */
static int sca_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t sca_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
port_t *port = dev_to_port(dev); port_t *port = dev_to_port(dev);
card_t *card = port_to_card(port); card_t *card = port_to_card(port);
@ -674,7 +674,7 @@ static int sca_xmit(struct sk_buff *skb, struct net_device *dev)
spin_unlock_irq(&port->lock); spin_unlock_irq(&port->lock);
dev_kfree_skb(skb); dev_kfree_skb(skb);
return 0; return NETDEV_TX_OK;
} }

4
drivers/net/wan/hd64572.c
View file

@ -562,7 +562,7 @@ static void sca_dump_rings(struct net_device *dev)
#endif /* DEBUG_RINGS */ #endif /* DEBUG_RINGS */
static int sca_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t sca_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
port_t *port = dev_to_port(dev); port_t *port = dev_to_port(dev);
card_t *card = port->card; card_t *card = port->card;
@ -601,7 +601,7 @@ static int sca_xmit(struct sk_buff *skb, struct net_device *dev)
spin_unlock_irq(&port->lock); spin_unlock_irq(&port->lock);
dev_kfree_skb(skb); dev_kfree_skb(skb);
return 0; return NETDEV_TX_OK;
} }

2
drivers/net/wan/hdlc.c
View file

@ -66,7 +66,7 @@ static int hdlc_rcv(struct sk_buff *skb, struct net_device *dev,
return hdlc->proto->netif_rx(skb); return hdlc->proto->netif_rx(skb);
} }
int hdlc_start_xmit(struct sk_buff *skb, struct net_device *dev) netdev_tx_t hdlc_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);

2
drivers/net/wan/hdlc_fr.c
View file

@ -407,7 +407,7 @@ static int pvc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
return -EINVAL; return -EINVAL;
} }
static int pvc_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t pvc_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
pvc_device *pvc = dev->ml_priv; pvc_device *pvc = dev->ml_priv;

2
drivers/net/wan/hdlc_raw_eth.c
View file

@ -25,7 +25,7 @@
static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr); static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr);
static int eth_tx(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t eth_tx(struct sk_buff *skb, struct net_device *dev)
{ {
int pad = ETH_ZLEN - skb->len; int pad = ETH_ZLEN - skb->len;
if (pad > 0) { /* Pad the frame with zeros */ if (pad > 0) { /* Pad the frame with zeros */

6
drivers/net/wan/hdlc_x25.c
View file

@ -87,7 +87,7 @@ static void x25_data_transmit(struct net_device *dev, struct sk_buff *skb)
static int x25_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
int result; int result;
@ -98,7 +98,7 @@ static int x25_xmit(struct sk_buff *skb, struct net_device *dev)
skb_pull(skb, 1); skb_pull(skb, 1);
if ((result = lapb_data_request(dev, skb)) != LAPB_OK) if ((result = lapb_data_request(dev, skb)) != LAPB_OK)
dev_kfree_skb(skb); dev_kfree_skb(skb);
return 0; return NETDEV_TX_OK;
case 1: case 1:
if ((result = lapb_connect_request(dev))!= LAPB_OK) { if ((result = lapb_connect_request(dev))!= LAPB_OK) {
@ -129,7 +129,7 @@ static int x25_xmit(struct sk_buff *skb, struct net_device *dev)
} }
dev_kfree_skb(skb); dev_kfree_skb(skb);
return 0; return NETDEV_TX_OK;
} }

3
drivers/net/wan/hostess_sv11.c
View file

@ -156,7 +156,8 @@ static int hostess_ioctl(struct net_device *d, struct ifreq *ifr, int cmd)
* Passed network frames, fire them downwind. * Passed network frames, fire them downwind.
*/ */
static int hostess_queue_xmit(struct sk_buff *skb, struct net_device *d) static netdev_tx_t hostess_queue_xmit(struct sk_buff *skb,
struct net_device *d)
{ {
return z8530_queue_xmit(&dev_to_sv(d)->chanA, skb); return z8530_queue_xmit(&dev_to_sv(d)->chanA, skb);
} }

3
drivers/net/wan/lapbether.c
View file

@ -147,7 +147,8 @@ static int lapbeth_data_indication(struct net_device *dev, struct sk_buff *skb)
/* /*
* Send a LAPB frame via an ethernet interface * Send a LAPB frame via an ethernet interface
*/ */
static int lapbeth_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t lapbeth_xmit(struct sk_buff *skb,
struct net_device *dev)
{ {
int err; int err;

9
drivers/net/wan/lmc/lmc_main.c
View file

@ -89,7 +89,8 @@ MODULE_DEVICE_TABLE(pci, lmc_pci_tbl);
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
static int lmc_start_xmit(struct sk_buff *skb, struct net_device *dev); static netdev_tx_t lmc_start_xmit(struct sk_buff *skb,
struct net_device *dev);
static int lmc_rx (struct net_device *dev); static int lmc_rx (struct net_device *dev);
static int lmc_open(struct net_device *dev); static int lmc_open(struct net_device *dev);
static int lmc_close(struct net_device *dev); static int lmc_close(struct net_device *dev);
@ -1423,12 +1424,12 @@ lmc_int_fail_out:
return IRQ_RETVAL(handled); return IRQ_RETVAL(handled);
} }
static int lmc_start_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t lmc_start_xmit(struct sk_buff *skb,
struct net_device *dev)
{ {
lmc_softc_t *sc = dev_to_sc(dev); lmc_softc_t *sc = dev_to_sc(dev);
u32 flag; u32 flag;
int entry; int entry;
int ret = NETDEV_TX_OK;
unsigned long flags; unsigned long flags;
lmc_trace(dev, "lmc_start_xmit in"); lmc_trace(dev, "lmc_start_xmit in");
@ -1510,7 +1511,7 @@ static int lmc_start_xmit(struct sk_buff *skb, struct net_device *dev)
spin_unlock_irqrestore(&sc->lmc_lock, flags); spin_unlock_irqrestore(&sc->lmc_lock, flags);
lmc_trace(dev, "lmc_start_xmit_out"); lmc_trace(dev, "lmc_start_xmit_out");
return ret; return NETDEV_TX_OK;
} }

7
drivers/net/wan/sbni.c
View file

@ -114,7 +114,8 @@ static int sbni_pci_probe( struct net_device * );
static struct net_device *sbni_probe1(struct net_device *, unsigned long, int); static struct net_device *sbni_probe1(struct net_device *, unsigned long, int);
static int sbni_open( struct net_device * ); static int sbni_open( struct net_device * );
static int sbni_close( struct net_device * ); static int sbni_close( struct net_device * );
static int sbni_start_xmit( struct sk_buff *, struct net_device * ); static netdev_tx_t sbni_start_xmit(struct sk_buff *,
struct net_device * );
static int sbni_ioctl( struct net_device *, struct ifreq *, int ); static int sbni_ioctl( struct net_device *, struct ifreq *, int );
static void set_multicast_list( struct net_device * ); static void set_multicast_list( struct net_device * );
@ -444,7 +445,7 @@ sbni_probe1( struct net_device *dev, unsigned long ioaddr, int irq )
#ifdef CONFIG_SBNI_MULTILINE #ifdef CONFIG_SBNI_MULTILINE
static int static netdev_tx_t
sbni_start_xmit( struct sk_buff *skb, struct net_device *dev ) sbni_start_xmit( struct sk_buff *skb, struct net_device *dev )
{ {
struct net_device *p; struct net_device *p;
@ -472,7 +473,7 @@ sbni_start_xmit( struct sk_buff *skb, struct net_device *dev )
#else /* CONFIG_SBNI_MULTILINE */ #else /* CONFIG_SBNI_MULTILINE */
static int static netdev_tx_t
sbni_start_xmit( struct sk_buff *skb, struct net_device *dev ) sbni_start_xmit( struct sk_buff *skb, struct net_device *dev )
{ {
struct net_local *nl = netdev_priv(dev); struct net_local *nl = netdev_priv(dev);

5
drivers/net/wan/sdla.c
View file

@ -651,7 +651,8 @@ static int sdla_dlci_conf(struct net_device *slave, struct net_device *master, i
**************************/ **************************/
/* NOTE: the DLCI driver deals with freeing the SKB!! */ /* NOTE: the DLCI driver deals with freeing the SKB!! */
static int sdla_transmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t sdla_transmit(struct sk_buff *skb,
struct net_device *dev)
{ {
struct frad_local *flp; struct frad_local *flp;
int ret, addr, accept, i; int ret, addr, accept, i;
@ -737,7 +738,7 @@ static int sdla_transmit(struct sk_buff *skb, struct net_device *dev)
if(flp->master[i]!=NULL) if(flp->master[i]!=NULL)
netif_wake_queue(flp->master[i]); netif_wake_queue(flp->master[i]);
} }
return(ret); return NETDEV_TX_OK;
} }
static void sdla_receive(struct net_device *dev) static void sdla_receive(struct net_device *dev)

3
drivers/net/wan/sealevel.c
View file

@ -156,7 +156,8 @@ static int sealevel_ioctl(struct net_device *d, struct ifreq *ifr, int cmd)
* Passed network frames, fire them downwind. * Passed network frames, fire them downwind.
*/ */
static int sealevel_queue_xmit(struct sk_buff *skb, struct net_device *d) static netdev_tx_t sealevel_queue_xmit(struct sk_buff *skb,
struct net_device *d)
{ {
return z8530_queue_xmit(dev_to_chan(d)->chan, skb); return z8530_queue_xmit(dev_to_chan(d)->chan, skb);
} }

2
drivers/net/wan/wanxl.c
View file

@ -268,7 +268,7 @@ static irqreturn_t wanxl_intr(int irq, void* dev_id)
static int wanxl_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t wanxl_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
port_t *port = dev_to_port(dev); port_t *port = dev_to_port(dev);
desc_t *desc; desc_t *desc;

3
drivers/net/wan/x25_asy.c
View file

@ -299,7 +299,8 @@ static void x25_asy_timeout(struct net_device *dev)
/* Encapsulate an IP datagram and kick it into a TTY queue. */ /* Encapsulate an IP datagram and kick it into a TTY queue. */
static int x25_asy_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t x25_asy_xmit(struct sk_buff *skb,
struct net_device *dev)
{ {
struct x25_asy *sl = netdev_priv(dev); struct x25_asy *sl = netdev_priv(dev);
int err; int err;

9
drivers/net/wan/z85230.c
View file

@ -1727,15 +1727,14 @@ static inline int spans_boundary(struct sk_buff *skb)
* point. * point.
*/ */
int z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb) netdev_tx_t z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb)
{ {
unsigned long flags; unsigned long flags;
netif_stop_queue(c->netdevice); netif_stop_queue(c->netdevice);
if(c->tx_next_skb) if(c->tx_next_skb)
{ return NETDEV_TX_BUSY;
return 1;
}
/* PC SPECIFIC - DMA limits */ /* PC SPECIFIC - DMA limits */
@ -1767,7 +1766,7 @@ int z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb)
z8530_tx_begin(c); z8530_tx_begin(c);
spin_unlock_irqrestore(c->lock, flags); spin_unlock_irqrestore(c->lock, flags);
return 0; return NETDEV_TX_OK;
} }
EXPORT_SYMBOL(z8530_queue_xmit); EXPORT_SYMBOL(z8530_queue_xmit);

3
drivers/net/wan/z85230.h
View file

@ -406,7 +406,8 @@ extern int z8530_sync_dma_close(struct net_device *, struct z8530_channel *);
extern int z8530_sync_txdma_open(struct net_device *, struct z8530_channel *); extern int z8530_sync_txdma_open(struct net_device *, struct z8530_channel *);
extern int z8530_sync_txdma_close(struct net_device *, struct z8530_channel *); extern int z8530_sync_txdma_close(struct net_device *, struct z8530_channel *);
extern int z8530_channel_load(struct z8530_channel *, u8 *); extern int z8530_channel_load(struct z8530_channel *, u8 *);
extern int z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb); extern netdev_tx_t z8530_queue_xmit(struct z8530_channel *c,
struct sk_buff *skb);
extern void z8530_null_rx(struct z8530_channel *c, struct sk_buff *skb); extern void z8530_null_rx(struct z8530_channel *c, struct sk_buff *skb);