.. | .. |
---|
254 | 254 | static void ni65_init_lance(struct priv *p,unsigned char*,int,int); |
---|
255 | 255 | static netdev_tx_t ni65_send_packet(struct sk_buff *skb, |
---|
256 | 256 | struct net_device *dev); |
---|
257 | | -static void ni65_timeout(struct net_device *dev); |
---|
| 257 | +static void ni65_timeout(struct net_device *dev, unsigned int txqueue); |
---|
258 | 258 | static int ni65_close(struct net_device *dev); |
---|
259 | 259 | static int ni65_alloc_buffer(struct net_device *dev); |
---|
260 | 260 | static void ni65_free_buffer(struct priv *p); |
---|
.. | .. |
---|
435 | 435 | } |
---|
436 | 436 | if(cards[i].vendor_id) { |
---|
437 | 437 | for(j=0;j<3;j++) |
---|
438 | | - if(inb(ioaddr+cards[i].addr_offset+j) != cards[i].vendor_id[j]) { |
---|
| 438 | + if(inb(ioaddr+cards[i].addr_offset+j) != cards[i].vendor_id[j]) |
---|
439 | 439 | release_region(ioaddr, cards[i].total_size); |
---|
440 | | - continue; |
---|
441 | | - } |
---|
442 | 440 | } |
---|
443 | 441 | break; |
---|
444 | 442 | } |
---|
.. | .. |
---|
699 | 697 | for(i=0;i<TMDNUM;i++) { |
---|
700 | 698 | kfree(p->tmdbounce[i]); |
---|
701 | 699 | #ifdef XMT_VIA_SKB |
---|
702 | | - if(p->tmd_skb[i]) |
---|
703 | | - dev_kfree_skb(p->tmd_skb[i]); |
---|
| 700 | + dev_kfree_skb(p->tmd_skb[i]); |
---|
704 | 701 | #endif |
---|
705 | 702 | } |
---|
706 | 703 | |
---|
707 | 704 | for(i=0;i<RMDNUM;i++) |
---|
708 | 705 | { |
---|
709 | 706 | #ifdef RCV_VIA_SKB |
---|
710 | | - if(p->recv_skb[i]) |
---|
711 | | - dev_kfree_skb(p->recv_skb[i]); |
---|
| 707 | + dev_kfree_skb(p->recv_skb[i]); |
---|
712 | 708 | #else |
---|
713 | 709 | kfree(p->recvbounce[i]); |
---|
714 | 710 | #endif |
---|
.. | .. |
---|
1030 | 1026 | |
---|
1031 | 1027 | #ifdef XMT_VIA_SKB |
---|
1032 | 1028 | if(p->tmd_skb[p->tmdlast]) { |
---|
1033 | | - dev_kfree_skb_irq(p->tmd_skb[p->tmdlast]); |
---|
| 1029 | + dev_consume_skb_irq(p->tmd_skb[p->tmdlast]); |
---|
1034 | 1030 | p->tmd_skb[p->tmdlast] = NULL; |
---|
1035 | 1031 | } |
---|
1036 | 1032 | #endif |
---|
.. | .. |
---|
1137 | 1133 | * kick xmitter .. |
---|
1138 | 1134 | */ |
---|
1139 | 1135 | |
---|
1140 | | -static void ni65_timeout(struct net_device *dev) |
---|
| 1136 | +static void ni65_timeout(struct net_device *dev, unsigned int txqueue) |
---|
1141 | 1137 | { |
---|
1142 | 1138 | int i; |
---|
1143 | 1139 | struct priv *p = dev->ml_priv; |
---|