xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/igb/igb_main.c
	drivers/net/qlge/qlge_main.c
	drivers/net/wireless/ath9k/ath9k.h
	drivers/net/wireless/ath9k/core.h
	drivers/net/wireless/ath9k/hw.c
This commit is contained in:
David S. Miller
2009-03-17 15:01:30 -07:00
parent bd257ed9f1 f10023a4ef
commit 2d6a5e9500
40 changed files with 5784 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/qlge/qlge_main.c
View File

@@ -1533,7 +1533,6 @@ static void ql_process_mac_rx_intr(struct ql_adapter *qdev,
QPRINTK(qdev, RX_STATUS, DEBUG, "Promiscuous Packet.\n");
}
skb->protocol = eth_type_trans(skb, ndev);
skb->ip_summed = CHECKSUM_NONE;
@@ -3248,6 +3247,7 @@ static int ql_adapter_down(struct ql_adapter *qdev)
netif_napi_del(&qdev->rx_ring[i].napi);
ql_free_rx_buffers(qdev);
spin_lock(&qdev->hw_lock);
status = ql_adapter_reset(qdev);
if (status)