patch-2.4.15 linux/drivers/net/tokenring/olympic.c

• Lines: 25
• Date: Fri Nov 9 13:46:29 2001
• Orig file: v2.4.14/linux/drivers/net/tokenring/olympic.c
• Orig date: Sun Sep 23 11:40:58 2001

diff -u --recursive --new-file v2.4.14/linux/drivers/net/tokenring/olympic.c linux/drivers/net/tokenring/olympic.c
@@ -737,7 +737,7 @@
 			} else {	
 			
 				if (buffer_cnt == 1) {
-					skb = dev_alloc_skb(olympic_priv->pkt_buf_sz) ; 
+					skb = dev_alloc_skb(max_t(int, olympic_priv->pkt_buf_sz,length)) ; 
 				} else {
 					skb = dev_alloc_skb(length) ; 
 				}
@@ -1684,7 +1684,7 @@
 
 static void __devexit olympic_remove_one(struct pci_dev *pdev) 
 {
-	struct net_device *dev = pdev->driver_data ; 
+	struct net_device *dev = pci_get_drvdata(pdev) ; 
 	struct olympic_private *olympic_priv=(struct olympic_private *)dev->priv;
 
 	if (olympic_priv->olympic_network_monitor) { 
@@ -1722,4 +1722,4 @@
 module_init(olympic_pci_init) ; 
 module_exit(olympic_pci_cleanup) ; 
 
-MODULE_LICENSE("GPL");
\ No newline at end of file
+MODULE_LICENSE("GPL");