Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27a1de95 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

3com: convert drivers to netdev_tx_t 



Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ad096463

drivers/net/3c501.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static void el_timeout(struct net_device *dev) 
 * 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);

	int ioaddr = dev->base_addr;

drivers/net/3c501.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
static int  el1_probe1(struct net_device *dev, int ioaddr);

static int  el_open(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 void el_receive(struct net_device *dev);

static void el_reset(struct net_device *dev);

drivers/net/3c505.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	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;

	elp_device *adapter = netdev_priv(dev);

drivers/net/3c507.c

+4 −2
Original line number Diff line number Diff line
@@ -284,7 +284,8 @@ static unsigned short init_words[] = { 


static int	el16_probe1(struct net_device *dev, int ioaddr);

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 void el16_rx(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);

	int ioaddr = dev->base_addr;

drivers/net/3c509.c

+2 −2
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static void el3_common_remove(struct net_device *dev); 
static ushort id_read_eeprom(int index);

static ushort read_eeprom(int ioaddr, int index);

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 void update_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)

{

	struct el3_private *lp = netdev_priv(dev);