net driver fixes
Subsystems (6)
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 drivers/s390/net/Kconfig | 9 drivers/s390/net/Makefile | 1 drivers/s390/net/ctcmain.c | 3 drivers/s390/net/iucv.c | 4 drivers/s390/net/lcs.c | 13 drivers/s390/net/netiucv.c | 80 +++- drivers/s390/net/qeth.h | 73 ++-- drivers/s390/net/qeth_eddp.c | 5 drivers/s390/net/qeth_main.c | 517 ++++++++++++++++---------------- drivers/s390/net/qeth_proc.c | 23 - drivers/s390/net/qeth_sys.c | 64 +++ drivers/s390/net/qeth_tso.h | 2 17 files changed, 547 insertions(+), 372 deletions(-)
Auke Kok:
e1000: fix TX timout hang regression for 82542rev3
Dale Farnsworth:
mv643xx_eth: Unmap DMA buffers in receive path
Frank Pavlic:
s390: minor s390 network driver fixes
s390: netiucv driver fixes
s390: Makefile cleanup
s390: qeth driver fixes [1/6]
s390: qeth driver fixes [2/6]
s390: qeth driver fixes [3/6]
s390: qeth driver fixes [4/6]
s390: qeth driver fixes [5/6]
s390: qeth driver fixes [6/6]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;
drivers/s390/net/Kconfig +0 -9
@@ -92,15 +92,6 @@ config QETH_VLAN If CONFIG_QETH is switched on, this option will include IEEE 802.1q VLAN support in the qeth device driver. -config QETH_PERF_STATS - bool "Performance statistics in /proc" - depends on QETH - help - When switched on, this option will add a file in the proc-fs - (/proc/qeth_perf_stats) containing performance statistics. It - may slightly impact performance, so this is only recommended for - internal tuning of the device driver. - config CCWGROUP tristate default (LCS || CTC || QETH)
drivers/s390/net/Makefile +0 -1
@@ -10,7 +10,6 @@ obj-$(CONFIG_SMSGIUCV) += smsgiucv.o obj-$(CONFIG_CTC) += ctc.o fsm.o cu3088.o obj-$(CONFIG_LCS) += lcs.o cu3088.o obj-$(CONFIG_CLAW) += claw.o cu3088.o -obj-$(CONFIG_MPC) += ctcmpc.o fsm.o cu3088.o qeth-y := qeth_main.o qeth_mpc.o qeth_sys.o qeth_eddp.o qeth-$(CONFIG_PROC_FS) += qeth_proc.o obj-$(CONFIG_QETH) += qeth.o
drivers/s390/net/ctcmain.c +3 -0
@@ -1714,6 +1714,9 @@ add_channel(struct ccw_device *cdev, enukfree (ch);return 0 ; } + +spin_lock_init (&ch->collect_lock); +fsm_settimer (ch->fsm, &ch->timer);skb_queue_head_init (&ch->io_queue);skb_queue_head_init (&ch->collect_queue);
drivers/s390/net/iucv.c +2 -2
@@ -335,8 +335,8 @@ do { \#else -#define iucv_debug(lvl, fmt, args...) -#define iucv_dumpit (title, buf, len) +#define iucv_debug(lvl, fmt, args...) do { } while (0) +#define iucv_dumpit (title, buf, len) do { } while (0)#endif
drivers/s390/net/lcs.c +5 -8
@@ -670,9 +670,8 @@ lcs_ready_buffer(struct lcs_channel *chaint index, rc;LCS_DBF_TEXT (5 , trace,"rdybuff" ); -if (buffer->state !=BUF_STATE_LOCKED && - buffer->state !=BUF_STATE_PROCESSED ) -BUG (); +BUG_ON (buffer->state !=BUF_STATE_LOCKED && + buffer->state !=BUF_STATE_PROCESSED );spin_lock_irqsave (get_ccwdev_lock (channel->ccwdev), flags); buffer->state =BUF_STATE_READY ; index = buffer - channel->iob;
@@ -696,8 +695,7 @@ __lcs_processed_buffer(struct lcs_channeint index, prev, next;LCS_DBF_TEXT (5 , trace,"prcsbuff" ); -if (buffer->state !=BUF_STATE_READY ) -BUG (); +BUG_ON (buffer->state !=BUF_STATE_READY ); buffer->state =BUF_STATE_PROCESSED ; index = buffer - channel->iob; prev = (index -1 ) & (LCS_NUM_BUFFS -1 );
@@ -729,9 +727,8 @@ lcs_release_buffer(struct lcs_channel *cunsigned long flags;LCS_DBF_TEXT (5 , trace,"relbuff" ); -if (buffer->state !=BUF_STATE_LOCKED && - buffer->state !=BUF_STATE_PROCESSED ) -BUG (); +BUG_ON (buffer->state !=BUF_STATE_LOCKED && + buffer->state !=BUF_STATE_PROCESSED );spin_lock_irqsave (get_ccwdev_lock (channel->ccwdev), flags); buffer->state =BUF_STATE_EMPTY ;spin_unlock_irqrestore (get_ccwdev_lock (channel->ccwdev), flags);
drivers/s390/net/netiucv.c +64 -16
215 lines not on this page · raw message
drivers/s390/net/qeth.h +36 -37
179 lines not on this page · raw message
drivers/s390/net/qeth_eddp.c +2 -3
@@ -179,9 +179,8 @@ out_check: flush_cnt++; } }else { -#ifdef CONFIG_QETH_PERF_STATS - queue->card->perf_stats.skbs_sent_pack++; -#endif +if (queue->card->options.performance_stats) + queue->card->perf_stats.skbs_sent_pack++;QETH_DBF_TEXT (trace,6 ,"fillbfpa" );if (buf->next_element_to_fill >=QETH_MAX_BUFFER_ELEMENTS (queue->card)) {
drivers/s390/net/qeth_main.c +271 -246
963 lines not on this page · raw message
drivers/s390/net/qeth_proc.c +11 -12
@@ -173,7 +173,6 @@ static struct file_operations qeth_procf#define QETH_PERF_PROCFILE_NAME "qeth_perf"static struct proc_dir_entry *qeth_perf_procfile; -#ifdef CONFIG_QETH_PERF_STATS static int qeth_perf_procfile_seq_show (struct seq_file *s,void *it) {
@@ -192,14 +191,21 @@ qeth_perf_procfile_seq_show(struct seq_fCARD_DDEV_ID (card),QETH_CARD_IFNAME (card) ); +if (!card->options.performance_stats) +seq_printf (s,"Performance statistics are deactivated.\n" );seq_printf (s," Skb's/buffers received : %lu/%u\n" " Skb's/buffers sent : %lu/%u\n\n" , - card->stats.rx_packets, card->perf_stats.bufs_rec, - card->stats.tx_packets, card->perf_stats.bufs_sent + card->stats.rx_packets - + card->perf_stats.initial_rx_packets, + card->perf_stats.bufs_rec, + card->stats.tx_packets - + card->perf_stats.initial_tx_packets, + card->perf_stats.bufs_sent );seq_printf (s," Skb's/buffers sent without packing : %lu/%u\n" " Skb's/buffers sent with packing : %u/%u\n\n" , - card->stats.tx_packets - card->perf_stats.skbs_sent_pack, + card->stats.tx_packets - card->perf_stats.initial_tx_packets + - card->perf_stats.skbs_sent_pack, card->perf_stats.bufs_sent - card->perf_stats.bufs_sent_pack, card->perf_stats.skbs_sent_pack, card->perf_stats.bufs_sent_pack
@@ -275,11 +281,6 @@ static struct file_operations qeth_perf_ .release = seq_release, }; -#define qeth_perf_procfile_created qeth_perf_procfile -#else -#define qeth_perf_procfile_created 1 -#endif /* CONFIG_QETH_PERF_STATS */ -int __init qeth_create_procfs_entries (void ) {
@@ -288,15 +289,13 @@ qeth_create_procfs_entries(void)if (qeth_procfile) qeth_procfile->proc_fops = &qeth_procfile_fops; -#ifdef CONFIG_QETH_PERF_STATS qeth_perf_procfile =create_proc_entry (QETH_PERF_PROCFILE_NAME ,S_IFREG |0444 ,NULL );if (qeth_perf_procfile) qeth_perf_procfile->proc_fops = &qeth_perf_procfile_fops; -#endif /* CONFIG_QETH_PERF_STATS */ if (qeth_procfile && - qeth_perf_procfile_created) + qeth_perf_procfile)return 0 ;else return -ENOMEM ;
drivers/s390/net/qeth_sys.c +58 -6
100 lines not on this page · raw message
drivers/s390/net/qeth_tso.h +1 -1
@@ -24,7 +24,7 @@ static inline struct qeth_hdr_tso * qeth_tso_prepare_skb(struct qeth_card *card, struct sk_buff **skb) { QETH_DBF_TEXT(trace, 5, "tsoprsk"); -return qeth_push_skb (card, skb,sizeof (struct qeth_hdr_tso )); +return qeth_push_skb (card, *skb,sizeof (struct qeth_hdr_tso )); }/**