diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-17 15:01:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-17 15:01:30 -0700 |
| commit | 2d6a5e9500103680464a723a4564961675652680 (patch) | |
| tree | d18903333aae8a4415b179d6e7d38f203724892c /drivers/net/qlge | |
| parent | bd257ed9f1d129b4e881f513a406b435c8852565 (diff) | |
| parent | f10023a4ef3f5cc05457b059c6880bc447adfa1f (diff) | |
| download | talos-obmc-linux-2d6a5e9500103680464a723a4564961675652680.tar.gz talos-obmc-linux-2d6a5e9500103680464a723a4564961675652680.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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
Diffstat (limited to 'drivers/net/qlge')
| -rw-r--r-- | drivers/net/qlge/qlge_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index b91b700a081b..170d3540f9c9 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c @@ -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) |
