net driver fixes
Subsystems (4)
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/Kconfig | 4 +- drivers/net/bonding/bond_main.c | 63 ++++++++++++++----------- drivers/net/cs89x0.c | 4 +- drivers/net/spider_net.c | 20 ++------ drivers/net/spider_net.h | 8 ++- drivers/net/wireless/zd1211rw/zd_ieee80211.h | 2 - drivers/net/wireless/zd1211rw/zd_mac.c | 2 - drivers/net/wireless/zd1211rw/zd_mac.h | 4 +- drivers/net/wireless/zd1211rw/zd_usb.c | 26 +++++----- drivers/net/wireless/zd1211rw/zd_usb.h | 14 +++--- net/ieee80211/ieee80211_tx.c | 4 +- net/ieee80211/softmac/ieee80211softmac_scan.c | 2 - 12 files changed, 76 insertions(+), 77 deletions(-)
George G. Davis:
Fix an offset error when reading the CS89x0 ADD_PORT register
James K Lewis:
Spidernet: remove ETH_ZLEN check in earlier patch
John W. Linville:
Revert "zd1211rw: Removed unneeded packed attributes"
Laurent Riffard:
bonding: fix an oops when slave device does not provide get_stats
Linas Vepstas:
spidernet: poor network performance
Michael Buesch:
softmac: remove netif_tx_disable when scanning
Ralf Baechle:
drivers/net: SAA9730: Fix build error
Ulrich Kunitz:
zd1211rw: Fix of a locking bug
Zhu Yi:
ieee80211: Fix kernel panic when QoS is enabled
drivers/net/Kconfig +2 -2
@@ -1769,8 +1769,8 @@ config VIA_RHINE_NAPI information. config LAN_SAA9730 - bool "Philips SAA9730 Ethernet support (EXPERIMENTAL)" - depends on NET_PCI && EXPERIMENTAL && MIPS + bool "Philips SAA9730 Ethernet support" + depends on NET_PCI && PCI && MIPS_ATLAS help The SAA9730 is a combined multimedia and peripheral controller used in thin clients, Internet access terminals, and diskless
drivers/net/bonding/bond_main.c +36 -27
75 lines not on this page · raw message
drivers/net/cs89x0.c +2 -2
@@ -588,10 +588,10 @@ #endif goto out2; } } -printk (KERN_DEBUG "PP_addr at %x[%x]: 0x%x\n" , - ioaddr,ADD_PORT ,readword (ioaddr,ADD_PORT )); ioaddr &= ~3 ; +printk (KERN_DEBUG "PP_addr at %x[%x]: 0x%x\n" , + ioaddr,ADD_PORT ,readword (ioaddr,ADD_PORT ));writeword (ioaddr,ADD_PORT , PP_ChipID); tmp =readword (ioaddr,DATA_PORT );
drivers/net/spider_net.c +6 -14
@@ -644,20 +644,12 @@ spider_net_prepare_tx_descr(struct spidestruct spider_net_descr *descr;dma_addr_t buf;unsigned long flags; -int length; - length = skb->len; -if (length <ETH_ZLEN ) { -if (skb_pad (skb,ETH_ZLEN -length)) -return 0 ; - length =ETH_ZLEN ; - } - - buf =pci_map_single (card->pdev, skb->data, length,PCI_DMA_TODEVICE ); + buf =pci_map_single (card->pdev, skb->data, skb->len,PCI_DMA_TODEVICE );if (pci_dma_mapping_error (buf)) {if (netif_msg_tx_err (card) &&net_ratelimit ())pr_err ("could not iommu-map packet (%p, %i). " -"Dropping packet\n" , skb->data, length); +"Dropping packet\n" , skb->data, skb->len); card->spider_stats.tx_iommu_map_error++;return -ENOMEM ; }
@@ -667,7 +659,7 @@ spider_net_prepare_tx_descr(struct spide card->tx_chain.head = descr->next; descr->buf_addr = buf; - descr->buf_size = length; + descr->buf_size = skb->len; descr->next_descr_addr =0 ; descr->skb = skb; descr->data_status =0 ;
@@ -802,8 +794,8 @@ spider_net_release_tx_chain(struct spide/* unmap the skb */ if (skb) { -int len = skb->len <ETH_ZLEN ?ETH_ZLEN : skb->len; -pci_unmap_single (card->pdev, buf_addr, len,PCI_DMA_TODEVICE ); +pci_unmap_single (card->pdev, buf_addr, skb->len, +PCI_DMA_TODEVICE );dev_kfree_skb (skb); } }
@@ -1641,7 +1633,7 @@ spider_net_enable_card(struct spider_net SPIDER_NET_INT2_MASK_VALUE);spider_net_write_reg (card,SPIDER_NET_GDTDMACCNTR , -SPIDER_NET_GDTBSTA |SPIDER_NET_GDTDCEIDIS ); +SPIDER_NET_GDTBSTA ); }/**
drivers/net/spider_net.h +4 -4
@@ -24,7 +24,7 @@#ifndef _SPIDER_NET_H#define _SPIDER_NET_H -#define VERSION "1.1 A" +#define VERSION "1.6 A"#include "sungem_phy.h"
@@ -217,8 +217,7 @@ #define SPIDER_NET_TX_DMA_EN 0#define SPIDER_NET_GDTBSTA 0x00000300#define SPIDER_NET_GDTDCEIDIS 0x00000002#define SPIDER_NET_DMA_TX_VALUE SPIDER_NET_TX_DMA_EN | \ - SPIDER_NET_GDTBSTA | \ - SPIDER_NET_GDTDCEIDIS + SPIDER_NET_GDTBSTA#define SPIDER_NET_DMA_TX_FEND_VALUE 0x00030003
@@ -328,7 +327,8 @@ enum spider_net_int2_status { SPIDER_NET_GRISPDNGINT }; -#define SPIDER_NET_TXINT ( (1 << SPIDER_NET_GDTFDCINT) ) +#define SPIDER_NET_TXINT ( (1 << SPIDER_NET_GDTFDCINT) | \ + (1 << SPIDER_NET_GDTDCEINT) )/* We rely on flagged descriptor interrupts */ #define SPIDER_NET_RXINT ( (1 << SPIDER_NET_GDAFDCINT) )
drivers/net/wireless/zd1211rw/zd_ieee80211.h +1 -1
@@ -64,7 +64,7 @@ struct cck_plcp_header {u8 service;__le16 length;__le16 crc16; -}; +} __attribute__((packed));static inline u8 zd_cck_plcp_header_rate (const struct cck_plcp_header *header) {
drivers/net/wireless/zd1211rw/zd_mac.c +1 -1
@@ -721,7 +721,7 @@ struct zd_rt_hdr {u8 rt_rate;u16 rt_channel;u16 rt_chbitmask; -}; +} __attribute__((packed)); static void fill_rt_header(void *buffer, struct zd_mac *mac, const struct ieee80211_rx_stats *stats,
drivers/net/wireless/zd1211rw/zd_mac.h +2 -2
@@ -82,7 +82,7 @@ #define ZD_PLCP_HEADER_SIZE 5struct rx_length_info {__le16 length[3 ];__le16 tag; -}; +} __attribute__((packed));#define RX_LENGTH_INFO_TAG 0x697e
@@ -93,7 +93,7 @@ struct rx_status {u8 signal_quality_ofdm;u8 decryption_type;u8 frame_status; -}; +} __attribute__((packed));/* rx_status field decryption_type */ #define ZD_RX_NO_WEP 0
drivers/net/wireless/zd1211rw/zd_usb.c +13 -13
@@ -366,15 +366,6 @@ error:return r; } -static void disable_read_regs_int (struct zd_usb *usb) -{ -struct zd_usb_interrupt *intr = &usb->intr; - -spin_lock (&intr->lock); - intr->read_regs_enabled =0 ; -spin_unlock (&intr->lock); -} -#define urb_dev (urb) (&(urb)->dev->dev)static inline void handle_regs_int (struct urb *urb)
@@ -1156,10 +1147,19 @@ static void prepare_read_regs_int(struct {struct zd_usb_interrupt *intr = &usb->intr; -spin_lock (&intr->lock); +spin_lock_irq (&intr->lock); intr->read_regs_enabled =1 ;INIT_COMPLETION (intr->read_regs.completion); -spin_unlock (&intr->lock); +spin_unlock_irq (&intr->lock); +} + +static void disable_read_regs_int (struct zd_usb *usb) +{ +struct zd_usb_interrupt *intr = &usb->intr; + +spin_lock_irq (&intr->lock); + intr->read_regs_enabled =0 ; +spin_unlock_irq (&intr->lock); } static int get_results(struct zd_usb *usb, u16 *values,
@@ -1171,7 +1171,7 @@ static int get_results(struct zd_usb *usstruct read_regs_int *rr = &intr->read_regs;struct usb_int_regs *regs = (struct usb_int_regs *)rr->buffer; -spin_lock (&intr->lock); +spin_lock_irq (&intr->lock); r = -EIO ;/* The created block size seems to be larger than expected.
@@ -1204,7 +1204,7 @@ static int get_results(struct zd_usb *us r =0 ; error_unlock: -spin_unlock (&intr->lock); +spin_unlock_irq (&intr->lock);return r; }
drivers/net/wireless/zd1211rw/zd_usb.h +7 -7
@@ -74,17 +74,17 @@ enum control_requests {struct usb_req_read_regs {__le16 id;__le16 addr[0 ]; -}; +} __attribute__((packed));struct reg_data {__le16 addr;__le16 value; -}; +} __attribute__((packed));struct usb_req_write_regs {__le16 id;struct reg_data reg_writes[0 ]; -}; +} __attribute__((packed));enum {RF_IF_LE =0x02 ,
@@ -101,7 +101,7 @@ struct usb_req_rfwrite {/* RF2595: 24 */ __le16 bit_values[0 ];/* (CR203 & ~(RF_IF_LE | RF_CLK | RF_DATA)) | (bit ? RF_DATA : 0) */ -}; +} __attribute__((packed));/* USB interrupt */
@@ -118,12 +118,12 @@ enum usb_int_flags {struct usb_int_header {u8 type;/* must always be 1 */ u8 id; -}; +} __attribute__((packed));struct usb_int_regs {struct usb_int_header hdr;struct reg_data regs[0 ]; -}; +} __attribute__((packed));struct usb_int_retry_fail {struct usb_int_header hdr;
@@ -131,7 +131,7 @@ struct usb_int_retry_fail {u8 _dummy;u8 addr[ETH_ALEN ];u8 ibss_wakeup_dest; -}; +} __attribute__((packed));struct read_regs_int {struct completion completion;
net/ieee80211/ieee80211_tx.c +2 -2
@@ -390,7 +390,7 @@ int ieee80211_xmit(struct sk_buff *skb,* this stack is providing the full 802.11 header, one will * eventually be affixed to this fragment -- so we must account * for it when determining the amount of payload space. */ - bytes_per_frag = frag_size -IEEE80211_3ADDR_LEN ; + bytes_per_frag = frag_size - hdr_len;if (ieee->config & (CFG_IEEE80211_COMPUTE_FCS |CFG_IEEE80211_RESERVE_FCS )) bytes_per_frag -=IEEE80211_FCS_LEN ;
@@ -412,7 +412,7 @@ int ieee80211_xmit(struct sk_buff *skb, }else { nr_frags =1 ; bytes_per_frag = bytes_last_frag = bytes; - frag_size = bytes +IEEE80211_3ADDR_LEN ; + frag_size = bytes + hdr_len; } rts_required = (frag_size > ieee->rts
net/ieee80211/softmac/ieee80211softmac_scan.c +0 -2
@@ -47,7 +47,6 @@ ieee80211softmac_start_scan(struct ieee8 sm->scanning =1 ;spin_unlock_irqrestore (&sm->lock, flags); -netif_tx_disable (sm->ieee->dev); ret = sm->start_scan (sm->dev);if (ret) {spin_lock_irqsave (&sm->lock, flags);
@@ -248,7 +247,6 @@ void ieee80211softmac_scan_finished(struif (net) sm->set_channel (sm->dev, net->channel); } -netif_wake_queue (sm->ieee->dev);ieee80211softmac_call_events (sm,IEEE80211SOFTMAC_EVENT_SCAN_FINISHED ,NULL ); }EXPORT_SYMBOL_GPL (ieee80211softmac_scan_finished);