forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-11 04dd17822334871b23ea2862f7798fb0e0007777
kernel/drivers/net/ethernet/amd/ni65.c
....@@ -254,7 +254,7 @@
254254 static void ni65_init_lance(struct priv *p,unsigned char*,int,int);
255255 static netdev_tx_t ni65_send_packet(struct sk_buff *skb,
256256 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);
258258 static int ni65_close(struct net_device *dev);
259259 static int ni65_alloc_buffer(struct net_device *dev);
260260 static void ni65_free_buffer(struct priv *p);
....@@ -435,10 +435,8 @@
435435 }
436436 if(cards[i].vendor_id) {
437437 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])
439439 release_region(ioaddr, cards[i].total_size);
440
- continue;
441
- }
442440 }
443441 break;
444442 }
....@@ -699,16 +697,14 @@
699697 for(i=0;i<TMDNUM;i++) {
700698 kfree(p->tmdbounce[i]);
701699 #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]);
704701 #endif
705702 }
706703
707704 for(i=0;i<RMDNUM;i++)
708705 {
709706 #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]);
712708 #else
713709 kfree(p->recvbounce[i]);
714710 #endif
....@@ -1030,7 +1026,7 @@
10301026
10311027 #ifdef XMT_VIA_SKB
10321028 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]);
10341030 p->tmd_skb[p->tmdlast] = NULL;
10351031 }
10361032 #endif
....@@ -1137,7 +1133,7 @@
11371133 * kick xmitter ..
11381134 */
11391135
1140
-static void ni65_timeout(struct net_device *dev)
1136
+static void ni65_timeout(struct net_device *dev, unsigned int txqueue)
11411137 {
11421138 int i;
11431139 struct priv *p = dev->ml_priv;