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

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

tokenring: convert to netdev_tx_t 



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

drivers/net/tokenring/3c359.c

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static int xl_init(struct net_device *dev); 
static int xl_open(struct net_device *dev);

static int xl_open_hw(struct net_device *dev) ;  

static int xl_hw_reset(struct net_device *dev); 

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

static netdev_tx_t xl_xmit(struct sk_buff *skb, struct net_device *dev);

static void xl_dn_comp(struct net_device *dev); 

static int xl_close(struct net_device *dev);

static void xl_set_rx_mode(struct net_device *dev);
@@ -1193,7 +1193,7 @@ static irqreturn_t xl_interrupt(int irq, void *dev_id) 
 *	Tx - Polling configuration

 */

	

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

static netdev_tx_t xl_xmit(struct sk_buff *skb, struct net_device *dev)

{

	struct xl_private *xl_priv=netdev_priv(dev);

	struct xl_tx_desc *txd ;

drivers/net/tokenring/ibmtr.c

+4 −2
Original line number Diff line number Diff line
@@ -191,7 +191,8 @@ static int tok_init_card(struct net_device *dev); 
static void	tok_open_adapter(unsigned long dev_addr);

static void 	open_sap(unsigned char type, struct net_device *dev);

static void 	tok_set_multicast_list(struct net_device *dev);

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

static netdev_tx_t tok_send_packet(struct sk_buff *skb,

					 struct net_device *dev);

static int 	tok_close(struct net_device *dev);

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

static void 	initial_tok_int(struct net_device *dev);
@@ -1022,7 +1023,8 @@ static void tok_set_multicast_list(struct net_device *dev) 


#define STATION_ID_OFST 4



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

static netdev_tx_t tok_send_packet(struct sk_buff *skb,

					 struct net_device *dev)

{

	struct tok_info *ti;

	unsigned long flags;

drivers/net/tokenring/lanstreamer.c

+4 −2
Original line number Diff line number Diff line
@@ -203,7 +203,8 @@ static int streamer_ioctl(struct net_device *, struct ifreq *, int); 


static int streamer_reset(struct net_device *dev);

static int streamer_open(struct net_device *dev);

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

static netdev_tx_t streamer_xmit(struct sk_buff *skb,

				       struct net_device *dev);

static int streamer_close(struct net_device *dev);

static void streamer_set_rx_mode(struct net_device *dev);

static irqreturn_t streamer_interrupt(int irq, void *dev_id);
@@ -1141,7 +1142,8 @@ static irqreturn_t streamer_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



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

static netdev_tx_t streamer_xmit(struct sk_buff *skb,

				       struct net_device *dev)

{

	struct streamer_private *streamer_priv =

	    netdev_priv(dev);

drivers/net/tokenring/olympic.c

+4 −2
Original line number Diff line number Diff line
@@ -182,7 +182,8 @@ MODULE_DEVICE_TABLE(pci,olympic_pci_tbl) ; 
static int olympic_probe(struct pci_dev *pdev, const struct pci_device_id *ent); 

static int olympic_init(struct net_device *dev);

static int olympic_open(struct net_device *dev);

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

static netdev_tx_t olympic_xmit(struct sk_buff *skb,

				      struct net_device *dev);

static int olympic_close(struct net_device *dev);

static void olympic_set_rx_mode(struct net_device *dev);

static void olympic_freemem(struct net_device *dev) ;
@@ -1030,7 +1031,8 @@ static irqreturn_t olympic_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

}	



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

static netdev_tx_t olympic_xmit(struct sk_buff *skb,

				      struct net_device *dev)

{

	struct olympic_private *olympic_priv=netdev_priv(dev);

	u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio;

drivers/net/tokenring/smctr.c

+4 −2
Original line number Diff line number Diff line
@@ -234,7 +234,8 @@ static int smctr_rx_frame(struct net_device *dev); 


/* S */

static int smctr_send_dat(struct net_device *dev);

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

static netdev_tx_t smctr_send_packet(struct sk_buff *skb,

					   struct net_device *dev);

static int smctr_send_lobe_media_test(struct net_device *dev);

static int smctr_send_rpt_addr(struct net_device *dev, MAC_HEADER *rmf,

        __u16 correlator);
@@ -4571,7 +4572,8 @@ static void smctr_timeout(struct net_device *dev) 
/*

 * Gets skb from system, queues it and checks if it can be sent

 */

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

static netdev_tx_t smctr_send_packet(struct sk_buff *skb,

					   struct net_device *dev)

{

        struct net_local *tp = netdev_priv(dev);