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
to receive the following updates:
MAINTAINERS | 8 ++ drivers/net/e1000/e1000_main.c | 1 drivers/net/forcedeth.c | 79 +++++++++++++++++--- drivers/net/gianfar.c | 56 +++++++------- drivers/net/gianfar.h | 67 ++++++++++++----- drivers/net/gianfar_ethtool.c | 20 +++-- drivers/net/gianfar_sysfs.c | 24 +++--- drivers/net/sky2.c | 52 ++++++++++--- drivers/net/sky2.h | 2 drivers/net/wireless/bcm43xx/bcm43xx_dma.h | 8 ++ drivers/net/wireless/bcm43xx/bcm43xx_pio.c | 92 ++++++++++++++++-------- drivers/net/wireless/bcm43xx/bcm43xx_pio.h | 16 +++- drivers/net/wireless/hostap/hostap_ioctl.c | 4 - include/linux/netdevice.h | 18 ++-- include/net/ieee80211softmac.h | 5 + net/ieee80211/softmac/ieee80211softmac_assoc.c | 20 ++++- net/ieee80211/softmac/ieee80211softmac_module.c | 2 net/ieee80211/softmac/ieee80211softmac_wx.c | 27 ++++--- 18 files changed, 354 insertions(+), 147 deletions(-)
Andy Fleming:
Fix locking in gianfar
Auke Kok:
e1000: Update truesize with the length of the packet for packet split
Ayaz Abdulla:
forcedeth: fix initialization
Johannes Berg:
softmac: fix SIOCSIWAP
Michael Buesch:
bcm43xx: add to MAINTAINERS
bcm43xx: make PIO mode usable
Pavel Roskin:
Fix crash on big-endian systems during scan
Stephen Hemminger:
sky2: reschedule if irq still pending
sky2: add fake idle irq timer
sky2: use ALIGN() macro
sky2: reset function can be devinit
sky2: version 1.2
MAINTAINERS +8 -0
@@ -421,6 +421,14 @@ L: [email protected] W: http://www.baycom.org/~tom/ham/ham.html S: Maintained +BCM43XX WIRELESS DRIVER +P: Michael Buesch +M: [email protected] +P: Stefano Brivio +M: [email protected] +W: http://bcm43xx.berlios.de/ +S: Maintained + BEFS FILE SYSTEM P: Sergey S. Kostyliov M: [email protected]
drivers/net/e1000/e1000_main.c +1 -0
@@ -3768,6 +3768,7 @@ #endif ps_page->ps_page[j] =NULL ; skb->len += length; skb->data_len += length; + skb->truesize += length; } copydone:
drivers/net/forcedeth.c +67 -12
211 lines not on this page · raw message
drivers/net/gianfar.c +28 -28
183 lines not on this page · raw message
drivers/net/gianfar.h +46 -21
108 lines not on this page · raw message
drivers/net/gianfar_ethtool.c +14 -6
@@ -455,10 +455,14 @@ static int gfar_sringparam(struct net_de/* Halt TX and RX, and process the frames which * have already been received */ -spin_lock_irqsave (&priv->lock, flags); +spin_lock_irqsave (&priv->txlock, flags); +spin_lock (&priv->rxlock); +gfar_halt (dev);gfar_clean_rx_ring (dev, priv->rx_ring_size); -spin_unlock_irqrestore (&priv->lock, flags); + +spin_unlock (&priv->rxlock); +spin_unlock_irqrestore (&priv->txlock, flags);/* Now we take down the rings to rebuild them */ stop_gfar (dev);
@@ -488,10 +492,14 @@ static int gfar_set_rx_csum(struct net_d/* Halt TX and RX, and process the frames which * have already been received */ -spin_lock_irqsave (&priv->lock, flags); +spin_lock_irqsave (&priv->txlock, flags); +spin_lock (&priv->rxlock); +gfar_halt (dev);gfar_clean_rx_ring (dev, priv->rx_ring_size); -spin_unlock_irqrestore (&priv->lock, flags); + +spin_unlock (&priv->rxlock); +spin_unlock_irqrestore (&priv->txlock, flags);/* Now we take down the rings to rebuild them */ stop_gfar (dev);
@@ -523,7 +531,7 @@ static int gfar_set_tx_csum(struct net_dif (!(priv->einfo->device_flags &FSL_GIANFAR_DEV_HAS_CSUM ))return -EOPNOTSUPP ; -spin_lock_irqsave (&priv->lock, flags); +spin_lock_irqsave (&priv->txlock, flags);gfar_halt (dev);if (data)
@@ -532,7 +540,7 @@ static int gfar_set_tx_csum(struct net_d dev->features &= ~NETIF_F_IP_CSUM ;gfar_start (dev); -spin_unlock_irqrestore (&priv->lock, flags); +spin_unlock_irqrestore (&priv->txlock, flags);return 0 ; }
drivers/net/gianfar_sysfs.c +12 -12
@@ -82,7 +82,7 @@ static ssize_t gfar_set_bd_stash(structelse return count; -spin_lock_irqsave (&priv->lock, flags); +spin_lock_irqsave (&priv->rxlock, flags);/* Set the new stashing value */ priv->bd_stash_en = new_setting;
@@ -96,7 +96,7 @@ static ssize_t gfar_set_bd_stash(structgfar_write (&priv->regs->attr, temp); -spin_unlock_irqrestore (&priv->lock, flags); +spin_unlock_irqrestore (&priv->rxlock, flags);return count; }
@@ -118,7 +118,7 @@ static ssize_t gfar_set_rx_stash_size(stu32 temp;unsigned long flags; -spin_lock_irqsave (&priv->lock, flags); +spin_lock_irqsave (&priv->rxlock, flags);if (length > priv->rx_buffer_size)return count;
@@ -142,7 +142,7 @@ static ssize_t gfar_set_rx_stash_size(stgfar_write (&priv->regs->attr, temp); -spin_unlock_irqrestore (&priv->lock, flags); +spin_unlock_irqrestore (&priv->rxlock, flags);return count; }
@@ -166,7 +166,7 @@ static ssize_t gfar_set_rx_stash_index(su32 temp;unsigned long flags; -spin_lock_irqsave (&priv->lock, flags); +spin_lock_irqsave (&priv->rxlock, flags);if (index > priv->rx_stash_size)return count;
@@ -180,7 +180,7 @@ static ssize_t gfar_set_rx_stash_index(s temp |=ATTRELI_EI (index);gfar_write (&priv->regs->attreli, flags); -spin_unlock_irqrestore (&priv->lock, flags); +spin_unlock_irqrestore (&priv->rxlock, flags);return count; }
@@ -205,7 +205,7 @@ static ssize_t gfar_set_fifo_threshold(sif (length >GFAR_MAX_FIFO_THRESHOLD )return count; -spin_lock_irqsave (&priv->lock, flags); +spin_lock_irqsave (&priv->txlock, flags); priv->fifo_threshold = length;
@@ -214,7 +214,7 @@ static ssize_t gfar_set_fifo_threshold(s temp |= length;gfar_write (&priv->regs->fifo_tx_thr, temp); -spin_unlock_irqrestore (&priv->lock, flags); +spin_unlock_irqrestore (&priv->txlock, flags);return count; }
@@ -240,7 +240,7 @@ static ssize_t gfar_set_fifo_starve(struif (num >GFAR_MAX_FIFO_STARVE )return count; -spin_lock_irqsave (&priv->lock, flags); +spin_lock_irqsave (&priv->txlock, flags); priv->fifo_starve = num;
@@ -249,7 +249,7 @@ static ssize_t gfar_set_fifo_starve(stru temp |= num;gfar_write (&priv->regs->fifo_tx_starve, temp); -spin_unlock_irqrestore (&priv->lock, flags); +spin_unlock_irqrestore (&priv->txlock, flags);return count; }
@@ -274,7 +274,7 @@ static ssize_t gfar_set_fifo_starve_off(if (num >GFAR_MAX_FIFO_STARVE_OFF )return count; -spin_lock_irqsave (&priv->lock, flags); +spin_lock_irqsave (&priv->txlock, flags); priv->fifo_starve_off = num;
@@ -283,7 +283,7 @@ static ssize_t gfar_set_fifo_starve_off( temp |= num;gfar_write (&priv->regs->fifo_tx_starve_shutoff, temp); -spin_unlock_irqrestore (&priv->lock, flags); +spin_unlock_irqrestore (&priv->txlock, flags);return count; }
drivers/net/sky2.c +41 -11
131 lines not on this page · raw message
drivers/net/sky2.h +2 -0
@@ -1880,6 +1880,8 @@ struct sky2_hw {struct sky2_status_le *st_le;u32 st_idx;dma_addr_t st_dma; + +struct timer_list idle_timer;int msi_detected;wait_queue_head_t msi_wait; };
drivers/net/wireless/bcm43xx/bcm43xx_dma.h +8 -0
@@ -213,6 +213,14 @@ static inlinevoid bcm43xx_dma_rx (struct bcm43xx_dmaring *ring) { } +static inline +void bcm43xx_dma_tx_suspend (struct bcm43xx_dmaring *ring) +{ +} +static inline +void bcm43xx_dma_tx_resume (struct bcm43xx_dmaring *ring) +{ +}#endif /* CONFIG_BCM43XX_DMA */ #endif /* BCM43xx_DMA_H_ */
drivers/net/wireless/bcm43xx/bcm43xx_pio.c +62 -30
220 lines not on this page · raw message
drivers/net/wireless/bcm43xx/bcm43xx_pio.h +14 -2
@@ -14,8 +14,8 @@ #define BCM43xx_PIO_TXQBUFSIZE 0x04#define BCM43xx_PIO_RXCTL 0x08#define BCM43xx_PIO_RXDATA 0x0A -#define BCM43xx_PIO_TXCTL_WRITEHI (1 << 0) -#define BCM43xx_PIO_TXCTL_WRITELO (1 << 1) +#define BCM43xx_PIO_TXCTL_WRITELO (1 << 0) +#define BCM43xx_PIO_TXCTL_WRITEHI (1 << 1)#define BCM43xx_PIO_TXCTL_COMPLETE (1 << 2)#define BCM43xx_PIO_TXCTL_INIT (1 << 3)#define BCM43xx_PIO_TXCTL_SUSPEND (1 << 7)
@@ -95,6 +95,7 @@ void bcm43xx_pio_write(struct bcm43xx_pi u16 offset, u16 value) {bcm43xx_write16 (queue->bcm, queue->mmio_base + offset, value); +mmiowb (); }
@@ -107,6 +108,9 @@ void bcm43xx_pio_handle_xmitstatus(struc struct bcm43xx_xmitstatus *status);void bcm43xx_pio_rx (struct bcm43xx_pioqueue *queue); +void bcm43xx_pio_tx_suspend (struct bcm43xx_pioqueue *queue); +void bcm43xx_pio_tx_resume (struct bcm43xx_pioqueue *queue); +#else /* CONFIG_BCM43XX_PIO */ static inline
@@ -133,6 +137,14 @@ static inlinevoid bcm43xx_pio_rx (struct bcm43xx_pioqueue *queue) { } +static inline +void bcm43xx_pio_tx_suspend (struct bcm43xx_pioqueue *queue) +{ +} +static inline +void bcm43xx_pio_tx_resume (struct bcm43xx_pioqueue *queue) +{ +}#endif /* CONFIG_BCM43XX_PIO */ #endif /* BCM43xx_PIO_H_ */
drivers/net/wireless/hostap/hostap_ioctl.c +2 -2
@@ -1860,7 +1860,7 @@ static char * __prism2_translate_scan(lomemset (&iwe,0 ,sizeof (iwe)); iwe.cmd =SIOCGIWFREQ ;if (scan) { - chan = scan->chid; + chan =le16_to_cpu (scan->chid); }else if (bss) { chan = bss->chan; }else {
@@ -1868,7 +1868,7 @@ static char * __prism2_translate_scan(lo }if (chan >0 ) { - iwe.u.freq.m = freq_list[le16_to_cpu (chan -1 )] *100000 ; + iwe.u.freq.m = freq_list[chan -1 ] *100000 ; iwe.u.freq.e =1 ; current_ev =iwe_stream_add_event (current_ev, end_buf, &iwe,IW_EV_FREQ_LEN );
include/linux/netdevice.h +10 -8
@@ -829,19 +829,21 @@ static inline void netif_rx_schedule(str__netif_rx_schedule (dev); } -/* Try to reschedule poll. Called by dev->poll() after netif_rx_complete(). -* Do not inline this? -*/ + +static inline void __netif_rx_reschedule (struct net_device *dev,int undo) +{ + dev->quota += undo; +list_add_tail (&dev->poll_list, &__get_cpu_var (softnet_data).poll_list); +__raise_softirq_irqoff (NET_RX_SOFTIRQ ); +} + +/* Try to reschedule poll. Called by dev->poll() after netif_rx_complete(). */ static inline int netif_rx_reschedule (struct net_device *dev,int undo) {if (netif_rx_schedule_prep (dev)) {unsigned long flags; - - dev->quota += undo; -local_irq_save (flags); -list_add_tail (&dev->poll_list, &__get_cpu_var (softnet_data).poll_list); -__raise_softirq_irqoff (NET_RX_SOFTIRQ ); +__netif_rx_reschedule (dev, undo);local_irq_restore (flags);return 1 ; }
include/net/ieee80211softmac.h +4 -1
@@ -96,10 +96,13 @@ struct ieee80211softmac_assoc_info {* * bssvalid is true if we found a matching network * and saved it's BSSID into the bssid above. +* +* bssfixed is used for SIOCSIWAP. */ u8 static_essid:1, associating:1, - bssvalid:1; + bssvalid:1, + bssfixed:1;/* Scan retries remaining */ int scan_retry;
net/ieee80211/softmac/ieee80211softmac_assoc.c +16 -4
@@ -144,6 +144,12 @@ network_matches_request(struct ieee80211if (!we_support_all_basic_rates (mac, net->rates_ex, net->rates_ex_len))return 0 ; +/* assume that users know what they're doing ... +* (note we don't let them select a net we're incompatible with) */ +if (mac->associnfo.bssfixed) { +return !memcmp (mac->associnfo.bssid, net->bssid,ETH_ALEN ); + } +/* if 'ANY' network requested, take any that doesn't have privacy enabled */ if (mac->associnfo.req_essid.len ==0 && !(net->capability &WLAN_CAPABILITY_PRIVACY ))
@@ -176,7 +182,7 @@ ieee80211softmac_assoc_work(void *d)ieee80211softmac_disassoc (mac,WLAN_REASON_DISASSOC_STA_HAS_LEFT );/* try to find the requested network in our list, if we found one already */ -if (mac->associnfo.bssvalid) +if (mac->associnfo.bssvalid || mac->associnfo.bssfixed) found =ieee80211softmac_get_network_by_bssid (mac, mac->associnfo.bssid);/* Search the ieee80211 networks for this network if we didn't find it by bssid,
@@ -241,19 +247,25 @@ ieee80211softmac_assoc_work(void *d)if (ieee80211softmac_start_scan (mac)) dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n");return ; - } -else { + }else {spin_lock_irqsave (&mac->lock, flags); mac->associnfo.associating =0 ; mac->associated =0 ;spin_unlock_irqrestore (&mac->lock, flags); dprintk(KERN_INFO PFX "Unable to find matching network after scan!\n"); +/* reset the retry counter for the next user request since we +* break out and don't reschedule ourselves after this point. */ + mac->associnfo.scan_retry =IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT ;ieee80211softmac_call_events (mac,IEEE80211SOFTMAC_EVENT_ASSOCIATE_NET_NOT_FOUND ,NULL );return ; } } - + +/* reset the retry counter for the next user request since we +* now found a net and will try to associate to it, but not +* schedule this function again. */ + mac->associnfo.scan_retry =IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT ; mac->associnfo.bssvalid =1 ;memcpy (mac->associnfo.bssid, found->bssid,ETH_ALEN );/* copy the ESSID for displaying it */
net/ieee80211/softmac/ieee80211softmac_module.c +2 -0
@@ -45,6 +45,8 @@ struct net_device *alloc_ieee80211softma softmac->ieee->handle_disassoc = ieee80211softmac_handle_disassoc; softmac->scaninfo =NULL ; + softmac->associnfo.scan_retry =IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT ; +/* TODO: initialise all the other callbacks in the ieee struct * (once they're written) */
net/ieee80211/softmac/ieee80211softmac_wx.c +17 -10
@@ -27,7 +27,8 @@#include "ieee80211softmac_priv.h" #include <net/iw_handler.h> - +/* for is_broadcast_ether_addr and is_zero_ether_addr */ +#include <linux/etherdevice.h> int ieee80211softmac_wx_trigger_scan(struct net_device *net_dev,
@@ -83,7 +84,6 @@ ieee80211softmac_wx_set_essid(struct net sm->associnfo.static_essid =1 ; } } - sm->associnfo.scan_retry =IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT ;/* set our requested ESSID length. * If applicable, we have already copied the data in */
@@ -310,8 +310,6 @@ ieee80211softmac_wx_set_wap(struct net_d char *extra) {struct ieee80211softmac_device *mac =ieee80211_priv (net_dev); -static const unsigned char any[] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; -static const unsigned char off[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 };unsigned long flags;/* sanity check */
@@ -320,10 +318,17 @@ ieee80211softmac_wx_set_wap(struct net_d }spin_lock_irqsave (&mac->lock, flags); -if (!memcmp (any, data->ap_addr.sa_data,ETH_ALEN ) || - !memcmp (off, data->ap_addr.sa_data,ETH_ALEN )) { -schedule_work (&mac->associnfo.work); - goto out; +if (is_broadcast_ether_addr (data->ap_addr.sa_data)) { +/* the bssid we have is not to be fixed any longer, +* and we should reassociate to the best AP. */ + mac->associnfo.bssfixed =0 ; +/* force reassociation */ + mac->associnfo.bssvalid =0 ; +if (mac->associated) +schedule_work (&mac->associnfo.work); + }else if (is_zero_ether_addr (data->ap_addr.sa_data)) { +/* the bssid we have is no longer fixed */ + mac->associnfo.bssfixed =0 ; }else {if (!memcmp (mac->associnfo.bssid, data->ap_addr.sa_data,ETH_ALEN )) {if (mac->associnfo.associating || mac->associated) {
@@ -333,12 +338,14 @@ ieee80211softmac_wx_set_wap(struct net_d }else {/* copy new value in data->ap_addr.sa_data to bssid */ memcpy (mac->associnfo.bssid, data->ap_addr.sa_data,ETH_ALEN ); - } + } +/* tell the other code that this bssid should be used no matter what */ + mac->associnfo.bssfixed =1 ;/* queue associate if new bssid or (old one again and not associated) */ schedule_work (&mac->associnfo.work); } -out: + out:spin_unlock_irqrestore (&mac->lock, flags);return 0 ; }