tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

tokenring: convert to netdev_tx_t

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Stephen Hemminger and committed by
David S. Miller 61a84108 25a79c41

+29 -18
+2 -2
drivers/net/tokenring/3c359.c
··· 128 128 static int xl_open(struct net_device *dev); 129 129 static int xl_open_hw(struct net_device *dev) ; 130 130 static int xl_hw_reset(struct net_device *dev); 131 - static int xl_xmit(struct sk_buff *skb, struct net_device *dev); 131 + static netdev_tx_t xl_xmit(struct sk_buff *skb, struct net_device *dev); 132 132 static void xl_dn_comp(struct net_device *dev); 133 133 static int xl_close(struct net_device *dev); 134 134 static void xl_set_rx_mode(struct net_device *dev); ··· 1193 1193 * Tx - Polling configuration 1194 1194 */ 1195 1195 1196 - static int xl_xmit(struct sk_buff *skb, struct net_device *dev) 1196 + static netdev_tx_t xl_xmit(struct sk_buff *skb, struct net_device *dev) 1197 1197 { 1198 1198 struct xl_private *xl_priv=netdev_priv(dev); 1199 1199 struct xl_tx_desc *txd ;
+4 -2
drivers/net/tokenring/ibmtr.c
··· 191 191 static void tok_open_adapter(unsigned long dev_addr); 192 192 static void open_sap(unsigned char type, struct net_device *dev); 193 193 static void tok_set_multicast_list(struct net_device *dev); 194 - static int tok_send_packet(struct sk_buff *skb, struct net_device *dev); 194 + static netdev_tx_t tok_send_packet(struct sk_buff *skb, 195 + struct net_device *dev); 195 196 static int tok_close(struct net_device *dev); 196 197 static irqreturn_t tok_interrupt(int irq, void *dev_id); 197 198 static void initial_tok_int(struct net_device *dev); ··· 1023 1022 1024 1023 #define STATION_ID_OFST 4 1025 1024 1026 - static int tok_send_packet(struct sk_buff *skb, struct net_device *dev) 1025 + static netdev_tx_t tok_send_packet(struct sk_buff *skb, 1026 + struct net_device *dev) 1027 1027 { 1028 1028 struct tok_info *ti; 1029 1029 unsigned long flags;
+4 -2
drivers/net/tokenring/lanstreamer.c
··· 203 203 204 204 static int streamer_reset(struct net_device *dev); 205 205 static int streamer_open(struct net_device *dev); 206 - static int streamer_xmit(struct sk_buff *skb, struct net_device *dev); 206 + static netdev_tx_t streamer_xmit(struct sk_buff *skb, 207 + struct net_device *dev); 207 208 static int streamer_close(struct net_device *dev); 208 209 static void streamer_set_rx_mode(struct net_device *dev); 209 210 static irqreturn_t streamer_interrupt(int irq, void *dev_id); ··· 1142 1141 return IRQ_HANDLED; 1143 1142 } 1144 1143 1145 - static int streamer_xmit(struct sk_buff *skb, struct net_device *dev) 1144 + static netdev_tx_t streamer_xmit(struct sk_buff *skb, 1145 + struct net_device *dev) 1146 1146 { 1147 1147 struct streamer_private *streamer_priv = 1148 1148 netdev_priv(dev);
+4 -2
drivers/net/tokenring/olympic.c
··· 182 182 static int olympic_probe(struct pci_dev *pdev, const struct pci_device_id *ent); 183 183 static int olympic_init(struct net_device *dev); 184 184 static int olympic_open(struct net_device *dev); 185 - static int olympic_xmit(struct sk_buff *skb, struct net_device *dev); 185 + static netdev_tx_t olympic_xmit(struct sk_buff *skb, 186 + struct net_device *dev); 186 187 static int olympic_close(struct net_device *dev); 187 188 static void olympic_set_rx_mode(struct net_device *dev); 188 189 static void olympic_freemem(struct net_device *dev) ; ··· 1031 1030 return IRQ_HANDLED; 1032 1031 } 1033 1032 1034 - static int olympic_xmit(struct sk_buff *skb, struct net_device *dev) 1033 + static netdev_tx_t olympic_xmit(struct sk_buff *skb, 1034 + struct net_device *dev) 1035 1035 { 1036 1036 struct olympic_private *olympic_priv=netdev_priv(dev); 1037 1037 u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio;
+4 -2
drivers/net/tokenring/smctr.c
··· 234 234 235 235 /* S */ 236 236 static int smctr_send_dat(struct net_device *dev); 237 - static int smctr_send_packet(struct sk_buff *skb, struct net_device *dev); 237 + static netdev_tx_t smctr_send_packet(struct sk_buff *skb, 238 + struct net_device *dev); 238 239 static int smctr_send_lobe_media_test(struct net_device *dev); 239 240 static int smctr_send_rpt_addr(struct net_device *dev, MAC_HEADER *rmf, 240 241 __u16 correlator); ··· 4572 4571 /* 4573 4572 * Gets skb from system, queues it and checks if it can be sent 4574 4573 */ 4575 - static int smctr_send_packet(struct sk_buff *skb, struct net_device *dev) 4574 + static netdev_tx_t smctr_send_packet(struct sk_buff *skb, 4575 + struct net_device *dev) 4576 4576 { 4577 4577 struct net_local *tp = netdev_priv(dev); 4578 4578
+11 -8
drivers/net/tokenring/tms380tr.c
··· 144 144 /* "G" */ 145 145 static struct net_device_stats *tms380tr_get_stats(struct net_device *dev); 146 146 /* "H" */ 147 - static int tms380tr_hardware_send_packet(struct sk_buff *skb, 148 - struct net_device *dev); 147 + static netdev_tx_t tms380tr_hardware_send_packet(struct sk_buff *skb, 148 + struct net_device *dev); 149 149 /* "I" */ 150 150 static int tms380tr_init_adapter(struct net_device *dev); 151 151 static void tms380tr_init_ipb(struct net_local *tp); ··· 165 165 static void tms380tr_reset_interrupt(struct net_device *dev); 166 166 static void tms380tr_ring_status_irq(struct net_device *dev); 167 167 /* "S" */ 168 - static int tms380tr_send_packet(struct sk_buff *skb, struct net_device *dev); 168 + static netdev_tx_t tms380tr_send_packet(struct sk_buff *skb, 169 + struct net_device *dev); 169 170 static void tms380tr_set_multicast_list(struct net_device *dev); 170 171 static int tms380tr_set_mac_address(struct net_device *dev, void *addr); 171 172 /* "T" */ ··· 600 599 /* 601 600 * Gets skb from system, queues it and checks if it can be sent 602 601 */ 603 - static int tms380tr_send_packet(struct sk_buff *skb, struct net_device *dev) 602 + static netdev_tx_t tms380tr_send_packet(struct sk_buff *skb, 603 + struct net_device *dev) 604 604 { 605 605 struct net_local *tp = netdev_priv(dev); 606 - int err; 606 + netdev_tx_t rc; 607 607 608 - err = tms380tr_hardware_send_packet(skb, dev); 608 + rc = tms380tr_hardware_send_packet(skb, dev); 609 609 if(tp->TplFree->NextTPLPtr->BusyFlag) 610 610 netif_stop_queue(dev); 611 - return (err); 611 + return rc; 612 612 } 613 613 614 614 /* 615 615 * Move frames into adapter tx queue 616 616 */ 617 - static int tms380tr_hardware_send_packet(struct sk_buff *skb, struct net_device *dev) 617 + static netdev_tx_t tms380tr_hardware_send_packet(struct sk_buff *skb, 618 + struct net_device *dev) 618 619 { 619 620 TPL *tpl; 620 621 short length;