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

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

netdev: convert pcmcia drivers to netdev_tx_t 



Update all the pcmcia network drivers for netdev_tx_t.

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

drivers/net/pcmcia/3c574_cs.c

+4 −2
Original line number Diff line number Diff line
@@ -239,7 +239,8 @@ static void tc574_wait_for_completion(struct net_device *dev, int cmd); 
static void tc574_reset(struct net_device *dev);

static void media_check(unsigned long arg);

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);
@@ -778,7 +779,8 @@ static void pop_tx_status(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)

{

	unsigned int ioaddr = dev->base_addr;

	struct el3_private *lp = netdev_priv(dev);

drivers/net/pcmcia/3c589_cs.c

+4 −2
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ static void tc589_reset(struct net_device *dev); 
static void media_check(unsigned long arg);

static int el3_config(struct net_device *dev, struct ifmap *map);

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);
@@ -604,7 +605,8 @@ static void pop_tx_status(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)

{

    unsigned int ioaddr = dev->base_addr;

    struct el3_private *priv = netdev_priv(dev);

drivers/net/pcmcia/axnet_cs.c

+4 −2
Original line number Diff line number Diff line
@@ -92,7 +92,8 @@ static void axnet_release(struct pcmcia_device *link); 
static int axnet_open(struct net_device *dev);

static int axnet_close(struct net_device *dev);

static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);

static int axnet_start_xmit(struct sk_buff *skb, struct net_device *dev);

static netdev_tx_t axnet_start_xmit(struct sk_buff *skb,

					  struct net_device *dev);

static struct net_device_stats *get_stats(struct net_device *dev);

static void set_multicast_list(struct net_device *dev);

static void axnet_tx_timeout(struct net_device *dev);
@@ -1063,7 +1064,8 @@ static void axnet_tx_timeout(struct net_device *dev) 
 * Sends a packet to an 8390 network device.

 */

 

static int axnet_start_xmit(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t axnet_start_xmit(struct sk_buff *skb,

					  struct net_device *dev)

{

	long e8390_base = dev->base_addr;

	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);

drivers/net/pcmcia/fmvj18x_cs.c

+4 −2
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ static void fmvj18x_detach(struct pcmcia_device *p_dev); 
static int fjn_config(struct net_device *dev, struct ifmap *map);

static int fjn_open(struct net_device *dev);

static int fjn_close(struct net_device *dev);

static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev);

static netdev_tx_t fjn_start_xmit(struct sk_buff *skb,

					struct net_device *dev);

static irqreturn_t fjn_interrupt(int irq, void *dev_id);

static void fjn_rx(struct net_device *dev);

static void fjn_reset(struct net_device *dev);
@@ -856,7 +857,8 @@ static void fjn_tx_timeout(struct net_device *dev) 
    netif_wake_queue(dev);

}



static int fjn_start_xmit(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t fjn_start_xmit(struct sk_buff *skb,

					struct net_device *dev)

{

    struct local_info_t *lp = netdev_priv(dev);

    unsigned int ioaddr = dev->base_addr;

drivers/net/pcmcia/nmclan_cs.c

+4 −2
Original line number Diff line number Diff line
@@ -424,7 +424,8 @@ static void nmclan_reset(struct net_device *dev); 
static int mace_config(struct net_device *dev, struct ifmap *map);

static int mace_open(struct net_device *dev);

static int mace_close(struct net_device *dev);

static int mace_start_xmit(struct sk_buff *skb, struct net_device *dev);

static netdev_tx_t mace_start_xmit(struct sk_buff *skb,

					 struct net_device *dev);

static void mace_tx_timeout(struct net_device *dev);

static irqreturn_t mace_interrupt(int irq, void *dev_id);

static struct net_device_stats *mace_get_stats(struct net_device *dev);
@@ -937,7 +938,8 @@ static void mace_tx_timeout(struct net_device *dev) 
  netif_wake_queue(dev);

}



static int mace_start_xmit(struct sk_buff *skb, struct net_device *dev)

static netdev_tx_t mace_start_xmit(struct sk_buff *skb,

					 struct net_device *dev)

{

  mace_private *lp = netdev_priv(dev);

  unsigned int ioaddr = dev->base_addr;