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

3com: convert drivers 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 27a1de95 ad096463

+26 -20
+1 -1
drivers/net/3c501.c
··· 409 409 * no real choice. 410 410 */ 411 411 412 - static int el_start_xmit(struct sk_buff *skb, struct net_device *dev) 412 + static netdev_tx_t el_start_xmit(struct sk_buff *skb, struct net_device *dev) 413 413 { 414 414 struct net_local *lp = netdev_priv(dev); 415 415 int ioaddr = dev->base_addr;
+1 -1
drivers/net/3c501.h
··· 6 6 static int el1_probe1(struct net_device *dev, int ioaddr); 7 7 static int el_open(struct net_device *dev); 8 8 static void el_timeout(struct net_device *dev); 9 - static int el_start_xmit(struct sk_buff *skb, struct net_device *dev); 9 + static netdev_tx_t el_start_xmit(struct sk_buff *skb, struct net_device *dev); 10 10 static irqreturn_t el_interrupt(int irq, void *dev_id); 11 11 static void el_receive(struct net_device *dev); 12 12 static void el_reset(struct net_device *dev);
+2 -2
drivers/net/3c505.c
··· 976 976 * 977 977 ******************************************************/ 978 978 979 - static bool send_packet(struct net_device *dev, struct sk_buff *skb) 979 + static netdev_tx_t send_packet(struct net_device *dev, struct sk_buff *skb) 980 980 { 981 981 elp_device *adapter = netdev_priv(dev); 982 982 unsigned long target; ··· 1067 1067 * 1068 1068 ******************************************************/ 1069 1069 1070 - static int elp_start_xmit(struct sk_buff *skb, struct net_device *dev) 1070 + static netdev_tx_t elp_start_xmit(struct sk_buff *skb, struct net_device *dev) 1071 1071 { 1072 1072 unsigned long flags; 1073 1073 elp_device *adapter = netdev_priv(dev);
+4 -2
drivers/net/3c507.c
··· 284 284 285 285 static int el16_probe1(struct net_device *dev, int ioaddr); 286 286 static int el16_open(struct net_device *dev); 287 - static int el16_send_packet(struct sk_buff *skb, struct net_device *dev); 287 + static netdev_tx_t el16_send_packet(struct sk_buff *skb, 288 + struct net_device *dev); 288 289 static irqreturn_t el16_interrupt(int irq, void *dev_id); 289 290 static void el16_rx(struct net_device *dev); 290 291 static int el16_close(struct net_device *dev); ··· 510 509 } 511 510 512 511 513 - static int el16_send_packet (struct sk_buff *skb, struct net_device *dev) 512 + static netdev_tx_t el16_send_packet (struct sk_buff *skb, 513 + struct net_device *dev) 514 514 { 515 515 struct net_local *lp = netdev_priv(dev); 516 516 int ioaddr = dev->base_addr;
+2 -2
drivers/net/3c509.c
··· 191 191 static ushort id_read_eeprom(int index); 192 192 static ushort read_eeprom(int ioaddr, int index); 193 193 static int el3_open(struct net_device *dev); 194 - static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev); 194 + static netdev_tx_t el3_start_xmit(struct sk_buff *skb, struct net_device *dev); 195 195 static irqreturn_t el3_interrupt(int irq, void *dev_id); 196 196 static void update_stats(struct net_device *dev); 197 197 static struct net_device_stats *el3_get_stats(struct net_device *dev); ··· 816 816 } 817 817 818 818 819 - static int 819 + static netdev_tx_t 820 820 el3_start_xmit(struct sk_buff *skb, struct net_device *dev) 821 821 { 822 822 struct el3_private *lp = netdev_priv(dev);
+4 -4
drivers/net/3c515.c
··· 369 369 struct pnp_dev *idev, int card_number); 370 370 static int corkscrew_open(struct net_device *dev); 371 371 static void corkscrew_timer(unsigned long arg); 372 - static int corkscrew_start_xmit(struct sk_buff *skb, 373 - struct net_device *dev); 372 + static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb, 373 + struct net_device *dev); 374 374 static int corkscrew_rx(struct net_device *dev); 375 375 static void corkscrew_timeout(struct net_device *dev); 376 376 static int boomerang_rx(struct net_device *dev); ··· 998 998 netif_wake_queue(dev); 999 999 } 1000 1000 1001 - static int corkscrew_start_xmit(struct sk_buff *skb, 1002 - struct net_device *dev) 1001 + static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb, 1002 + struct net_device *dev) 1003 1003 { 1004 1004 struct corkscrew_private *vp = netdev_priv(dev); 1005 1005 int ioaddr = dev->base_addr;
+2 -2
drivers/net/3c523.c
··· 183 183 static irqreturn_t elmc_interrupt(int irq, void *dev_id); 184 184 static int elmc_open(struct net_device *dev); 185 185 static int elmc_close(struct net_device *dev); 186 - static int elmc_send_packet(struct sk_buff *, struct net_device *); 186 + static netdev_tx_t elmc_send_packet(struct sk_buff *, struct net_device *); 187 187 static struct net_device_stats *elmc_get_stats(struct net_device *dev); 188 188 static void elmc_timeout(struct net_device *dev); 189 189 #ifdef ELMC_MULTICAST ··· 1129 1129 * send frame 1130 1130 */ 1131 1131 1132 - static int elmc_send_packet(struct sk_buff *skb, struct net_device *dev) 1132 + static netdev_tx_t elmc_send_packet(struct sk_buff *skb, struct net_device *dev) 1133 1133 { 1134 1134 int len; 1135 1135 int i;
+4 -2
drivers/net/3c527.c
··· 213 213 static int mc32_command(struct net_device *dev, u16 cmd, void *data, int len); 214 214 static int mc32_open(struct net_device *dev); 215 215 static void mc32_timeout(struct net_device *dev); 216 - static int mc32_send_packet(struct sk_buff *skb, struct net_device *dev); 216 + static netdev_tx_t mc32_send_packet(struct sk_buff *skb, 217 + struct net_device *dev); 217 218 static irqreturn_t mc32_interrupt(int irq, void *dev_id); 218 219 static int mc32_close(struct net_device *dev); 219 220 static struct net_device_stats *mc32_get_stats(struct net_device *dev); ··· 1021 1020 * 1022 1021 */ 1023 1022 1024 - static int mc32_send_packet(struct sk_buff *skb, struct net_device *dev) 1023 + static netdev_tx_t mc32_send_packet(struct sk_buff *skb, 1024 + struct net_device *dev) 1025 1025 { 1026 1026 struct mc32_local *lp = netdev_priv(dev); 1027 1027 u32 head = atomic_read(&lp->tx_ring_head);
+6 -4
drivers/net/3c59x.c
··· 716 716 static void mdio_write(struct net_device *vp, int phy_id, int location, int value); 717 717 static void vortex_timer(unsigned long arg); 718 718 static void rx_oom_timer(unsigned long arg); 719 - static int vortex_start_xmit(struct sk_buff *skb, struct net_device *dev); 720 - static int boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev); 719 + static netdev_tx_t vortex_start_xmit(struct sk_buff *skb, 720 + struct net_device *dev); 721 + static netdev_tx_t boomerang_start_xmit(struct sk_buff *skb, 722 + struct net_device *dev); 721 723 static int vortex_rx(struct net_device *dev); 722 724 static int boomerang_rx(struct net_device *dev); 723 725 static irqreturn_t vortex_interrupt(int irq, void *dev_id); ··· 2037 2035 } 2038 2036 } 2039 2037 2040 - static int 2038 + static netdev_tx_t 2041 2039 vortex_start_xmit(struct sk_buff *skb, struct net_device *dev) 2042 2040 { 2043 2041 struct vortex_private *vp = netdev_priv(dev); ··· 2092 2090 return NETDEV_TX_OK; 2093 2091 } 2094 2092 2095 - static int 2093 + static netdev_tx_t 2096 2094 boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev) 2097 2095 { 2098 2096 struct vortex_private *vp = netdev_priv(dev);