redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

3com: convert drivers to netdev_tx_t 

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Stephen Hemminger 2009-08-31 19:50:54 +00:00 committed by David S. Miller
parent ad096463f7
commit 27a1de95a1
9 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/3c501.c
View File

@ -409,7 +409,7 @@ static void el_timeout(struct net_device *dev)
* no real choice. * no real choice.
*/ */
static int el_start_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t el_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct net_local *lp = netdev_priv(dev); struct net_local *lp = netdev_priv(dev);
int ioaddr = dev->base_addr; int ioaddr = dev->base_addr;

2
drivers/net/3c501.h
View File

@ -6,7 +6,7 @@
static int el1_probe1(struct net_device *dev, int ioaddr); static int el1_probe1(struct net_device *dev, int ioaddr);
static int el_open(struct net_device *dev); static int el_open(struct net_device *dev);
static void el_timeout(struct net_device *dev); static void el_timeout(struct net_device *dev);
static int el_start_xmit(struct sk_buff *skb, struct net_device *dev); static netdev_tx_t el_start_xmit(struct sk_buff *skb, struct net_device *dev);
static irqreturn_t el_interrupt(int irq, void *dev_id); static irqreturn_t el_interrupt(int irq, void *dev_id);
static void el_receive(struct net_device *dev); static void el_receive(struct net_device *dev);
static void el_reset(struct net_device *dev); static void el_reset(struct net_device *dev);

4
drivers/net/3c505.c
View File

@ -976,7 +976,7 @@ static int elp_open(struct net_device *dev)
* *
******************************************************/ ******************************************************/
static bool send_packet(struct net_device *dev, struct sk_buff *skb) static netdev_tx_t send_packet(struct net_device *dev, struct sk_buff *skb)
{ {
elp_device *adapter = netdev_priv(dev); elp_device *adapter = netdev_priv(dev);
unsigned long target; unsigned long target;
@ -1067,7 +1067,7 @@ static void elp_timeout(struct net_device *dev)
* *
******************************************************/ ******************************************************/
static int elp_start_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t elp_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
unsigned long flags; unsigned long flags;
elp_device *adapter = netdev_priv(dev); elp_device *adapter = netdev_priv(dev);

6
drivers/net/3c507.c
View File

@ -284,7 +284,8 @@ static unsigned short init_words[] = {
static int el16_probe1(struct net_device *dev, int ioaddr); static int el16_probe1(struct net_device *dev, int ioaddr);
static int el16_open(struct net_device *dev); static int el16_open(struct net_device *dev);
static int el16_send_packet(struct sk_buff *skb, struct net_device *dev); static netdev_tx_t el16_send_packet(struct sk_buff *skb,
struct net_device *dev);
static irqreturn_t el16_interrupt(int irq, void *dev_id); static irqreturn_t el16_interrupt(int irq, void *dev_id);
static void el16_rx(struct net_device *dev); static void el16_rx(struct net_device *dev);
static int el16_close(struct net_device *dev); static int el16_close(struct net_device *dev);
@ -509,7 +510,8 @@ static void el16_tx_timeout (struct net_device *dev)
} }
static int el16_send_packet (struct sk_buff *skb, struct net_device *dev) static netdev_tx_t el16_send_packet (struct sk_buff *skb,
struct net_device *dev)
{ {
struct net_local *lp = netdev_priv(dev); struct net_local *lp = netdev_priv(dev);
int ioaddr = dev->base_addr; int ioaddr = dev->base_addr;

4
drivers/net/3c509.c
View File

@ -191,7 +191,7 @@ static void el3_common_remove(struct net_device *dev);
static ushort id_read_eeprom(int index); static ushort id_read_eeprom(int index);
static ushort read_eeprom(int ioaddr, int index); static ushort read_eeprom(int ioaddr, int index);
static int el3_open(struct net_device *dev); static int el3_open(struct net_device *dev);
static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev); static netdev_tx_t el3_start_xmit(struct sk_buff *skb, struct net_device *dev);
static irqreturn_t el3_interrupt(int irq, void *dev_id); static irqreturn_t el3_interrupt(int irq, void *dev_id);
static void update_stats(struct net_device *dev); static void update_stats(struct net_device *dev);
static struct net_device_stats *el3_get_stats(struct net_device *dev); static struct net_device_stats *el3_get_stats(struct net_device *dev);
@ -816,7 +816,7 @@ el3_tx_timeout (struct net_device *dev)
} }
static int static netdev_tx_t
el3_start_xmit(struct sk_buff *skb, struct net_device *dev) el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);

8
drivers/net/3c515.c
View File

@ -369,8 +369,8 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
struct pnp_dev *idev, int card_number); struct pnp_dev *idev, int card_number);
static int corkscrew_open(struct net_device *dev); static int corkscrew_open(struct net_device *dev);
static void corkscrew_timer(unsigned long arg); static void corkscrew_timer(unsigned long arg);
static int corkscrew_start_xmit(struct sk_buff *skb, static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb,
struct net_device *dev); struct net_device *dev);
static int corkscrew_rx(struct net_device *dev); static int corkscrew_rx(struct net_device *dev);
static void corkscrew_timeout(struct net_device *dev); static void corkscrew_timeout(struct net_device *dev);
static int boomerang_rx(struct net_device *dev); static int boomerang_rx(struct net_device *dev);
@ -998,8 +998,8 @@ static void corkscrew_timeout(struct net_device *dev)
netif_wake_queue(dev); netif_wake_queue(dev);
} }
static int corkscrew_start_xmit(struct sk_buff *skb, static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb,
struct net_device *dev) struct net_device *dev)
{ {
struct corkscrew_private *vp = netdev_priv(dev); struct corkscrew_private *vp = netdev_priv(dev);
int ioaddr = dev->base_addr; int ioaddr = dev->base_addr;

4
drivers/net/3c523.c
View File

@ -183,7 +183,7 @@ sizeof(nop_cmd) = 8;
static irqreturn_t elmc_interrupt(int irq, void *dev_id); static irqreturn_t elmc_interrupt(int irq, void *dev_id);
static int elmc_open(struct net_device *dev); static int elmc_open(struct net_device *dev);
static int elmc_close(struct net_device *dev); static int elmc_close(struct net_device *dev);
static int elmc_send_packet(struct sk_buff *, struct net_device *); static netdev_tx_t elmc_send_packet(struct sk_buff *, struct net_device *);
static struct net_device_stats *elmc_get_stats(struct net_device *dev); static struct net_device_stats *elmc_get_stats(struct net_device *dev);
static void elmc_timeout(struct net_device *dev); static void elmc_timeout(struct net_device *dev);
#ifdef ELMC_MULTICAST #ifdef ELMC_MULTICAST
@ -1129,7 +1129,7 @@ static void elmc_timeout(struct net_device *dev)
* send frame * send frame
*/ */
static int elmc_send_packet(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t elmc_send_packet(struct sk_buff *skb, struct net_device *dev)
{ {
int len; int len;
int i; int i;

6
drivers/net/3c527.c
View File

@ -213,7 +213,8 @@ static int mc32_probe1(struct net_device *dev, int ioaddr);
static int mc32_command(struct net_device *dev, u16 cmd, void *data, int len); static int mc32_command(struct net_device *dev, u16 cmd, void *data, int len);
static int mc32_open(struct net_device *dev); static int mc32_open(struct net_device *dev);
static void mc32_timeout(struct net_device *dev); static void mc32_timeout(struct net_device *dev);
static int mc32_send_packet(struct sk_buff *skb, struct net_device *dev); static netdev_tx_t mc32_send_packet(struct sk_buff *skb,
struct net_device *dev);
static irqreturn_t mc32_interrupt(int irq, void *dev_id); static irqreturn_t mc32_interrupt(int irq, void *dev_id);
static int mc32_close(struct net_device *dev); static int mc32_close(struct net_device *dev);
static struct net_device_stats *mc32_get_stats(struct net_device *dev); static struct net_device_stats *mc32_get_stats(struct net_device *dev);
@ -1020,7 +1021,8 @@ static void mc32_timeout(struct net_device *dev)
* *
*/ */
static int mc32_send_packet(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t mc32_send_packet(struct sk_buff *skb,
struct net_device *dev)
{ {
struct mc32_local *lp = netdev_priv(dev); struct mc32_local *lp = netdev_priv(dev);
u32 head = atomic_read(&lp->tx_ring_head); u32 head = atomic_read(&lp->tx_ring_head);

10
drivers/net/3c59x.c
View File

@ -716,8 +716,10 @@ static int mdio_read(struct net_device *dev, int phy_id, int location);
static void mdio_write(struct net_device *vp, int phy_id, int location, int value); static void mdio_write(struct net_device *vp, int phy_id, int location, int value);
static void vortex_timer(unsigned long arg); static void vortex_timer(unsigned long arg);
static void rx_oom_timer(unsigned long arg); static void rx_oom_timer(unsigned long arg);
static int vortex_start_xmit(struct sk_buff *skb, struct net_device *dev); static netdev_tx_t vortex_start_xmit(struct sk_buff *skb,
static int boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev); struct net_device *dev);
static netdev_tx_t boomerang_start_xmit(struct sk_buff *skb,
struct net_device *dev);
static int vortex_rx(struct net_device *dev); static int vortex_rx(struct net_device *dev);
static int boomerang_rx(struct net_device *dev); static int boomerang_rx(struct net_device *dev);
static irqreturn_t vortex_interrupt(int irq, void *dev_id); static irqreturn_t vortex_interrupt(int irq, void *dev_id);
@ -2035,7 +2037,7 @@ vortex_error(struct net_device *dev, int status)
} }
} }
static int static netdev_tx_t
vortex_start_xmit(struct sk_buff *skb, struct net_device *dev) vortex_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct vortex_private *vp = netdev_priv(dev); struct vortex_private *vp = netdev_priv(dev);
@ -2090,7 +2092,7 @@ vortex_start_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
static int static netdev_tx_t
boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev) boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct vortex_private *vp = netdev_priv(dev); struct vortex_private *vp = netdev_priv(dev);