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

s2io: add PCI error recovery support

s2io cleanup suggestions, per discussion on mailing lists.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

authored by

Linas Vepstas and committed by
Jeff Garzik
146bd683 d796fdb7

-3
-2
drivers/net/s2io.c
··· 3970 3970 /* Reset card, kill tasklet and free Tx and Rx buffers. */ 3971 3971 s2io_card_down(sp); 3972 3972 3973 - sp->device_close_flag = TRUE; /* Device is shut down. */ 3974 3973 return 0; 3975 3974 } 3976 3975 ··· 8052 8053 if (netif_running(netdev)) { 8053 8054 /* Bring down the card, while avoiding PCI I/O */ 8054 8055 do_s2io_card_down(sp, 0); 8055 - sp->device_close_flag = TRUE; /* Device is shut down. */ 8056 8056 } 8057 8057 pci_disable_device(pdev); 8058 8058
-1
drivers/net/s2io.h
··· 794 794 795 795 struct net_device_stats stats; 796 796 int high_dma_flag; 797 - int device_close_flag; 798 797 int device_enabled_once; 799 798 800 799 char name[60];