net driver fixes
Subsystems (3)
PATCH 1/1 net driver fixes
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-linus
to receive the following updates:
drivers/net/e1000/e1000_main.c | 8 ++-- drivers/net/mv643xx_eth.c | 2 + drivers/net/wireless/zd1211rw/zd_chip.c | 61 ++++++++++++++++++++++++-------- drivers/net/wireless/zd1211rw/zd_mac.c | 43 ++++++++++++++++++---- drivers/net/wireless/zd1211rw/zd_mac.h | 11 +++-- 5 files changed, 94 insertions(+), 31 deletions(-)
Auke Kok:
e1000: fix TX timout hang regression for 82542rev3
Dale Farnsworth:
mv643xx_eth: Unmap DMA buffers in receive path
Ulrich Kunitz:
zd1211rw: Fix of signal strength and quality measurement
drivers/net/e1000/e1000_main.c +4 -4
@@ -1433,8 +1433,8 @@ e1000_configure_tx(struct e1000_adapterE1000_WRITE_REG (hw,TDBAL , (tdba &0x00000000ffffffffULL ));E1000_WRITE_REG (hw,TDT ,0 );E1000_WRITE_REG (hw,TDH ,0 ); - adapter->tx_ring[0 ].tdh =E1000_TDH ; - adapter->tx_ring[0 ].tdt =E1000_TDT ; + adapter->tx_ring[0 ].tdh = ((hw->mac_type >= e1000_82543) ?E1000_TDH :E1000_82542_TDH ); + adapter->tx_ring[0 ].tdt = ((hw->mac_type >= e1000_82543) ?E1000_TDT :E1000_82542_TDT );break ; }
@@ -1840,8 +1840,8 @@ #endifE1000_WRITE_REG (hw,RDBAL , (rdba &0x00000000ffffffffULL ));E1000_WRITE_REG (hw,RDT ,0 );E1000_WRITE_REG (hw,RDH ,0 ); - adapter->rx_ring[0 ].rdh =E1000_RDH ; - adapter->rx_ring[0 ].rdt =E1000_RDT ; + adapter->rx_ring[0 ].rdh = ((hw->mac_type >= e1000_82543) ?E1000_RDH :E1000_82542_RDH ); + adapter->rx_ring[0 ].rdt = ((hw->mac_type >= e1000_82543) ?E1000_RDT :E1000_82542_RDT );break ; }
drivers/net/mv643xx_eth.c +2 -0
@@ -385,6 +385,8 @@ static int mv643xx_eth_receive_queue(strstruct pkt_info pkt_info;while (budget-- >0 &ð_port_receive (mp, &pkt_info) ==ETH_OK ) { +dma_unmap_single (NULL , pkt_info.buf_ptr,RX_SKB_SIZE , +DMA_FROM_DEVICE ); mp->rx_desc_count--; received_packets++;
drivers/net/wireless/zd1211rw/zd_chip.c +46 -15
86 lines not on this page · raw message
drivers/net/wireless/zd1211rw/zd_mac.c +35 -8
78 lines not on this page · raw message
drivers/net/wireless/zd1211rw/zd_mac.h +7 -4
@@ -1,4 +1,4 @@ -/* zd_mac.c +/* zd_mac.h * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
@@ -87,9 +87,9 @@ struct rx_length_info {#define RX_LENGTH_INFO_TAG 0x697estruct rx_status { +u8 signal_quality_cck;/* rssi */ u8 signal_strength; -u8 signal_quality_cck;u8 signal_quality_ofdm;u8 decryption_type;u8 frame_status;
@@ -120,14 +120,17 @@ enum mac_flags { MAC_FIXED_CHANNEL = 0x01, }; +#define ZD_MAC_STATS_BUFFER_SIZE 16 +struct zd_mac {struct net_device *netdev;struct zd_chip chip;spinlock_t lock;/* Unlocked reading possible */ struct iw_statistics iw_stats; -u8 qual_average; -u8 rssi_average; +unsigned int stats_count; +u8 qual_buffer[ZD_MAC_STATS_BUFFER_SIZE ]; +u8 rssi_buffer[ZD_MAC_STATS_BUFFER_SIZE ];u8 regdomain;u8 default_regdomain;u8 requested_channel;