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

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'e100-fixes' of git://198.78.49.142/~jbrandeb/linux-2.6

Jeff Garzik ca68bb1e 485ff099

+4 -1
+4 -1
drivers/net/e100.c
··· 2154 2154 2155 2155 msleep(10); 2156 2156 2157 + pci_dma_sync_single_for_cpu(nic->pdev, nic->rx_to_clean->dma_addr, 2158 + RFD_BUF_LEN, PCI_DMA_FROMDEVICE); 2159 + 2157 2160 if(memcmp(nic->rx_to_clean->skb->data + sizeof(struct rfd), 2158 2161 skb->data, ETH_DATA_LEN)) 2159 2162 err = -EAGAIN; ··· 2164 2161 err_loopback_none: 2165 2162 mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR, 0); 2166 2163 nic->loopback = lb_none; 2167 - e100_hw_init(nic); 2168 2164 e100_clean_cbs(nic); 2165 + e100_hw_reset(nic); 2169 2166 err_clean_rx: 2170 2167 e100_rx_clean_list(nic); 2171 2168 return err;