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
to receive the following updates:
drivers/net/ne.c | 2 drivers/net/wireless/Kconfig | 2 drivers/net/wireless/airo.c | 46 +++------- drivers/net/wireless/atmel.c | 11 ++ drivers/net/wireless/bcm43xx/Kconfig | 3 drivers/net/wireless/bcm43xx/bcm43xx.h | 17 +++ drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c | 8 - drivers/net/wireless/bcm43xx/bcm43xx_dma.c | 13 +- drivers/net/wireless/bcm43xx/bcm43xx_main.c | 2 drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 1 drivers/net/wireless/bcm43xx/bcm43xx_power.c | 115 ++++++++++++++----------- drivers/net/wireless/bcm43xx/bcm43xx_power.h | 9 + drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c | 115 ++++++++++++++----------- drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h | 16 --- drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 8 - drivers/net/wireless/orinoco.c | 2 include/net/ieee80211softmac.h | 3 net/core/dev.c | 3 net/core/wireless.c | 8 + net/ieee80211/softmac/Kconfig | 1 net/ieee80211/softmac/ieee80211softmac_assoc.c | 5 - net/ieee80211/softmac/ieee80211softmac_event.c | 40 +++++++- net/ieee80211/softmac/ieee80211softmac_io.c | 18 +++ net/ieee80211/softmac/ieee80211softmac_scan.c | 2 net/ieee80211/softmac/ieee80211softmac_wx.c | 10 ++ 25 files changed, 289 insertions(+), 171 deletions(-)
Adrian Bunk:
bcm43xx: fix dyn tssi2dbm memleak
Dan Williams:
wireless/airo: clean up WEXT association and scan events wireless/atmel: send WEXT scan completion events
Erik Mouw:
bcm43xx: iw_priv_args names should be <16 characters
Jean Tourrilhes:
wext: Fix IWENCODEEXT security permissions Revert NET_RADIO Kconfig title change
wext: Fix RtNetlink ENCODE security permissions
Johannes Berg:
softmac: fix event sending
softmac: report when scanning has finished
[email protected]:
softmac: return -EAGAIN from getscan while scanning
softmac: dont send out packets while scanning
softmac: handle iw_mode properly
Michael Buesch:
softmac: fix spinlock recursion on reassoc
bcm43xx: set trans_start on TX to prevent bogus timeouts
bcm43xx: fix pctl slowclock limit calculation
bcm43xx: sysfs code cleanup
Pavel Roskin:
orinoco: fix truncating commsquality RID with the latest Symbol firmware
Randy Dunlap:
softmac uses Wiress Ext.
bcm43xx wireless: fix printk format warnings
bcm43xx: fix config menu alignment
Sergei Shtylyov:
NEx000: fix RTL8019AS base address for RBTX4938
drivers/net/ne.c +1 -1
@@ -226,7 +226,7 @@ struct net_device * __init ne_probe(intnetdev_boot_setup_check (dev);#ifdef CONFIG_TOSHIBA_RBTX4938 - dev->base_addr =0x07f20280 ; + dev->base_addr =RBTX4938_RTL_8019_BASE ; dev->irq =RBTX4938_RTL_8019_IRQ ;#endif err =do_ne_probe (dev);
drivers/net/wireless/Kconfig +1 -1
@@ -6,7 +6,7 @@ menu "Wireless LAN (non-hamradio)" depends on NETDEVICES config NET_RADIO - bool "Wireless LAN drivers (non-hamradio)" + bool "Wireless LAN drivers (non-hamradio) & Wireless Extensions" select WIRELESS_EXT ---help--- Support for wireless LANs and everything having to do with radio,
drivers/net/wireless/airo.c +17 -29
84 lines not on this page · raw message
drivers/net/wireless/atmel.c +11 -0
@@ -3463,6 +3463,7 @@ static void atmel_command_irq(struct atmu8 status =atmel_rmem8 (priv,atmel_co (priv,CMD_BLOCK_STATUS_OFFSET ));u8 command =atmel_rmem8 (priv,atmel_co (priv,CMD_BLOCK_COMMAND_OFFSET ));int fast_scan; +union iwreq_data wrqu;if (status ==CMD_STATUS_IDLE || status ==CMD_STATUS_IN_PROGRESS )
@@ -3487,6 +3488,7 @@ static void atmel_command_irq(struct atmatmel_scan (priv,1 ); }else {int bss_index =retrieve_bss (priv); +int notify_scan_complete =1 ;if (bss_index !=-1 ) {atmel_join_bss (priv, bss_index); } else if (priv->operating_mode == IW_MODE_ADHOC &&
@@ -3495,8 +3497,14 @@ static void atmel_command_irq(struct atm }else { priv->fast_scan = !fast_scan;atmel_scan (priv,1 ); + notify_scan_complete =0 ; } priv->site_survey_state =SITE_SURVEY_COMPLETED ; +if (notify_scan_complete) { + wrqu.data.length =0 ; + wrqu.data.flags =0 ; +wireless_send_event (priv->dev,SIOCGIWSCAN , &wrqu,NULL ); + } }break ;
@@ -3509,6 +3517,9 @@ static void atmel_command_irq(struct atm priv->site_survey_state =SITE_SURVEY_COMPLETED ;if (priv->station_is_associated) {atmel_enter_state (priv,STATION_STATE_READY ); + wrqu.data.length =0 ; + wrqu.data.flags =0 ; +wireless_send_event (priv->dev,SIOCGIWSCAN , &wrqu,NULL ); }else {atmel_scan (priv,1 ); }
drivers/net/wireless/bcm43xx/Kconfig +3 -0
@@ -17,8 +17,11 @@ config BCM43XX_DEBUG config BCM43XX_DMA bool + depends on BCM43XX + config BCM43XX_PIO bool + depends on BCM43XX choice prompt "BCM43xx data transfer mode"
drivers/net/wireless/bcm43xx/bcm43xx.h +14 -3
@@ -15,7 +15,6 @@#include "bcm43xx_debugfs.h" #include "bcm43xx_leds.h" -#include "bcm43xx_sysfs.h" #define PFX KBUILD_MODNAME ": "
@@ -638,8 +637,6 @@ struct bcm43xx_key { };struct bcm43xx_private { -struct bcm43xx_sysfs sysfs; -struct ieee80211_device *ieee;struct ieee80211softmac_device *softmac;
@@ -772,6 +769,20 @@ struct bcm43xx_private * bcm43xx_priv(streturn ieee80211softmac_priv (dev); } +struct device ; + +static inline +struct bcm43xx_private *dev_to_bcm (struct device *dev) +{ +struct net_device *net_dev; +struct bcm43xx_private *bcm; + + net_dev =dev_get_drvdata (dev); + bcm =bcm43xx_priv (net_dev); + +return bcm; +} +/* Helper function, which returns a boolean. * TRUE, if PIO is used; FALSE, if DMA is used.
drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c +4 -4
@@ -452,12 +452,12 @@ void bcm43xx_printk_dump(const char *datsize_t i;char c; - printk(KERN_INFO PFX "Data dump (%s, %u bytes):", + printk(KERN_INFO PFX "Data dump (%s, %zd bytes):", description, size);for (i =0 ; i < size; i++) { c = data[i];if (i %8 ==0 ) -printk ("\n" KERN_INFO PFX "0x%08x: 0x%02x, " , i, c &0xff ); +printk ("\n" KERN_INFO PFX "0x%08zx: 0x%02x, " , i, c &0xff );else printk ("0x%02x, " , c &0xff ); }
@@ -472,12 +472,12 @@ void bcm43xx_printk_bitdump(const unsignint j;const unsigned char *d; - printk(KERN_INFO PFX "*** Bitdump (%s, %u bytes, %s) ***", + printk(KERN_INFO PFX "*** Bitdump (%s, %zd bytes, %s) ***", description, bytes, msb_to_lsb ? "MSB to LSB" : "LSB to MSB");for (i =0 ; i < bytes; i++) { d = data + i;if (i %8 ==0 ) -printk ("\n" KERN_INFO PFX "0x%08x: " , i); +printk ("\n" KERN_INFO PFX "0x%08zx: " , i);if (msb_to_lsb) {for (j =7 ; j >=0 ; j--) {if (*d & (1 << j))
drivers/net/wireless/bcm43xx/bcm43xx_dma.c +7 -6
@@ -196,8 +196,9 @@ static int alloc_ringmemory(struct bcm43 }if (ring->dmabase + BCM43xx_DMA_RINGMEMSIZE > BCM43xx_DMA_BUSADDRMAX) { printk(KERN_ERR PFX ">>>FATAL ERROR<<< DMA RINGMEMORY >1G " -"(0x%08x, len: %lu)\n" , - ring->dmabase, BCM43xx_DMA_RINGMEMSIZE); +"(0x%llx, len: %lu)\n" , + (unsigned long long )ring->dmabase, + BCM43xx_DMA_RINGMEMSIZE);dma_free_coherent (dev, BCM43xx_DMA_RINGMEMSIZE, ring->vbase, ring->dmabase);return -ENOMEM ;
@@ -307,8 +308,8 @@ static int setup_rx_descbuffer(struct bcunmap_descbuffer (ring, dmaaddr, ring->rx_buffersize,0 );dev_kfree_skb_any (skb); printk(KERN_ERR PFX ">>>FATAL ERROR<<< DMA RX SKB >1G " -"(0x%08x, len: %u)\n" , - dmaaddr, ring->rx_buffersize); +"(0x%llx, len: %u)\n" , + (unsigned long long)dmaaddr, ring->rx_buffersize);return -ENOMEM ; } meta->skb = skb;
@@ -729,8 +730,8 @@ static int dma_tx_fragment(struct bcm43xif (unlikely (meta->dmaaddr + skb->len > BCM43xx_DMA_BUSADDRMAX)) {return_slot (ring, slot); printk(KERN_ERR PFX ">>>FATAL ERROR<<< DMA TX SKB >1G " -"(0x%08x, len: %u)\n" , - meta->dmaaddr, skb->len); +"(0x%llx, len: %u)\n" , + (unsigned long long)meta->dmaaddr, skb->len);return -ENOMEM ; }
drivers/net/wireless/bcm43xx/bcm43xx_main.c +2 -0
@@ -52,6 +52,7 @@#include "bcm43xx_wx.h" #include "bcm43xx_ethtool.h" #include "bcm43xx_xmit.h" +#include "bcm43xx_sysfs.h" MODULE_DESCRIPTION ("Broadcom BCM43xx wireless driver" );
@@ -3522,6 +3523,7 @@ static inline int bcm43xx_tx(struct bcm4 err =bcm43xx_pio_tx (bcm, txb); else err =bcm43xx_dma_tx (bcm, txb); + bcm->net_dev->trans_start = jiffies;return err; }
drivers/net/wireless/bcm43xx/bcm43xx_phy.c +1 -0
@@ -2151,6 +2151,7 @@ int bcm43xx_phy_init_tssi2dbm_table(stru phy->tssi2dbm =NULL ; printk(KERN_ERR PFX "Could not generate " "tssi2dBm table\n"); +kfree (dyn_tssi2dbm);return -ENODEV ; } phy->tssi2dbm = dyn_tssi2dbm;
drivers/net/wireless/bcm43xx/bcm43xx_power.c +68 -47
162 lines not on this page · raw message
drivers/net/wireless/bcm43xx/bcm43xx_power.h +9 -0
@@ -33,6 +33,15 @@#include <linux/types.h> +/* Clock sources */ +enum { +/* PCI clock */ + BCM43xx_PCTL_CLKSRC_PCI, +/* Crystal slow clock oscillator */ + BCM43xx_PCTL_CLKSRC_XTALOS, +/* Low power oscillator */ + BCM43xx_PCTL_CLKSRC_LOPWROS, +};struct bcm43xx_private ;
drivers/net/wireless/bcm43xx/bcm43xx_sysfs.c +67 -48
217 lines not on this page · raw message
drivers/net/wireless/bcm43xx/bcm43xx_sysfs.h +0 -16
@@ -1,22 +1,6 @@#ifndef BCM43xx_SYSFS_H_#define BCM43xx_SYSFS_H_ -#include <linux/device.h> - - -struct bcm43xx_sysfs { -struct device_attribute attr_sprom; -struct device_attribute attr_interfmode; -struct device_attribute attr_preamble; -}; - -#define devattr_to_bcm (attr, attr_name) ({ \ - struct bcm43xx_sysfs *__s; struct bcm43xx_private *__p; \ - __s = container_of((attr), struct bcm43xx_sysfs, attr_name); \ - __p = container_of(__s, struct bcm43xx_private, sysfs); \ - __p; \ - }) -struct bcm43xx_private ;int bcm43xx_sysfs_register (struct bcm43xx_private *bcm);
drivers/net/wireless/bcm43xx/bcm43xx_wx.c +4 -4
@@ -962,22 +962,22 @@ static const struct iw_priv_args bcm43xx { .cmd = PRIV_WX_SET_SHORTPREAMBLE, .set_args = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, - .name = "set_shortpreambl", + .name = "set_shortpreamb", }, { .cmd = PRIV_WX_GET_SHORTPREAMBLE, .get_args = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING, - .name = "get_shortpreambl", + .name = "get_shortpreamb", }, { .cmd = PRIV_WX_SET_SWENCRYPTION, .set_args = IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, - .name = "set_swencryption", + .name = "set_swencrypt", }, { .cmd = PRIV_WX_GET_SWENCRYPTION, .get_args = IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | MAX_WX_STRING, - .name = "get_swencryption", + .name = "get_swencrypt", }, { .cmd = PRIV_WX_SPROM_WRITE,
drivers/net/wireless/orinoco.c +1 -1
@@ -390,7 +390,7 @@ static struct iw_statistics *orinoco_get } }else {struct { -__le16 qual, signal, noise; +__le16 qual, signal, noise, unused; } __attribute__ ((packed)) cq; err = HERMES_READ_RECORD(hw, USER_BAP,
include/net/ieee80211softmac.h +2 -1
@@ -267,8 +267,9 @@ extern void ieee80211softmac_stop(struct#define IEEE80211SOFTMAC_EVENT_AUTH_FAILED 5#define IEEE80211SOFTMAC_EVENT_AUTH_TIMEOUT 6#define IEEE80211SOFTMAC_EVENT_ASSOCIATE_NET_NOT_FOUND 7 +#define IEEE80211SOFTMAC_EVENT_DISASSOCIATED 8/* keep this updated! */ -#define IEEE80211SOFTMAC_EVENT_LAST 7 +#define IEEE80211SOFTMAC_EVENT_LAST 8/* * If you want to be notified of certain events, you can call * ieee80211softmac_notify[_atomic] with
net/core/dev.c +2 -1
@@ -2698,7 +2698,8 @@ int dev_ioctl(unsigned int cmd, void __u/* If command is `set a parameter', or * `get the encoding parameters', check if * the user has the right to do it */ -if (IW_IS_SET (cmd) || cmd ==SIOCGIWENCODE ) { +if (IW_IS_SET (cmd) || cmd ==SIOCGIWENCODE + || cmd ==SIOCGIWENCODEEXT ) {if (!capable (CAP_NET_ADMIN ))return -EPERM ; }
net/core/wireless.c +8 -0
@@ -1726,6 +1726,14 @@ int wireless_rtnetlink_get(struct net_deif (!IW_IS_GET (request->cmd))return -EOPNOTSUPP ; +/* If command is `get the encoding parameters', check if +* the user has the right to do it */ +if (request->cmd ==SIOCGIWENCODE || + request->cmd ==SIOCGIWENCODEEXT ) { +if (!capable (CAP_NET_ADMIN )) +return -EPERM ; + } +/* Special cases */ if (request->cmd ==SIOCGIWSTATS )/* Get Wireless Stats */
net/ieee80211/softmac/Kconfig +1 -0
@@ -1,6 +1,7 @@ config IEEE80211_SOFTMAC tristate "Software MAC add-on to the IEEE 802.11 networking stack" depends on IEEE80211 && EXPERIMENTAL + select WIRELESS_EXT ---help--- This option enables the hardware independent software MAC addon for the IEEE 802.11 networking stack.
net/ieee80211/softmac/ieee80211softmac_assoc.c +4 -1
@@ -101,6 +101,7 @@ ieee80211softmac_disassoc(struct ieee802/* Do NOT clear bssvalid as that will break ieee80211softmac_assoc_work! */ mac->associated =0 ; mac->associnfo.associating =0 ; +ieee80211softmac_call_events_locked (mac,IEEE80211SOFTMAC_EVENT_DISASSOCIATED ,NULL );spin_unlock_irqrestore (&mac->lock, flags); }
@@ -373,6 +374,7 @@ ieee80211softmac_handle_disassoc(structspin_lock_irqsave (&mac->lock, flags); mac->associnfo.bssvalid =0 ; mac->associated =0 ; +ieee80211softmac_call_events_locked (mac,IEEE80211SOFTMAC_EVENT_DISASSOCIATED ,NULL );schedule_work (&mac->associnfo.work);spin_unlock_irqrestore (&mac->lock, flags);
@@ -391,6 +393,7 @@ ieee80211softmac_handle_reassoc_req(stru dprintkl(KERN_INFO PFX "reassoc request from unknown network\n");return 0 ; } -ieee80211softmac_assoc (mac, network); +schedule_work (&mac->associnfo.work); +return 0 ; }
net/ieee80211/softmac/ieee80211softmac_event.c +35 -5
@@ -67,6 +67,7 @@ static char *event_descriptions[IEEE8021"authenticating failed" ,"authenticating timed out" ,"associating failed because no suitable network was found" , + "disassociated", };
@@ -128,13 +129,42 @@ void ieee80211softmac_call_events_locked(struct ieee80211softmac_device *mac, int event, void *event_ctx) { struct ieee80211softmac_event *eventptr, *tmp; -union iwreq_data wrqu; -char *msg; +struct ieee80211softmac_network *network;if (event >=0 ) { - msg = event_descriptions[event]; - wrqu.data.length =strlen (msg); -wireless_send_event (mac->dev,IWEVCUSTOM , &wrqu, msg); +union iwreq_data wrqu; +int we_event; +char *msg =NULL ; + +switch (event) { +case IEEE80211SOFTMAC_EVENT_ASSOCIATED : + network = (struct ieee80211softmac_network *)event_ctx; + wrqu.data.length =0 ; + wrqu.data.flags =0 ; +memcpy (wrqu.ap_addr.sa_data, &network->bssid[0 ],ETH_ALEN ); + wrqu.ap_addr.sa_family =ARPHRD_ETHER ; + we_event =SIOCGIWAP ; +break ; +case IEEE80211SOFTMAC_EVENT_DISASSOCIATED : + wrqu.data.length =0 ; + wrqu.data.flags =0 ; +memset (&wrqu,'\0' ,sizeof (union iwreq_data )); + wrqu.ap_addr.sa_family =ARPHRD_ETHER ; + we_event =SIOCGIWAP ; +break ; +case IEEE80211SOFTMAC_EVENT_SCAN_FINISHED : + wrqu.data.length =0 ; + wrqu.data.flags =0 ; +memset (&wrqu,'\0' ,sizeof (union iwreq_data )); + we_event =SIOCGIWSCAN ; +break ; +default : + msg = event_descriptions[event]; + wrqu.data.length =strlen (msg); + we_event =IWEVCUSTOM ; +break ; + } +wireless_send_event (mac->dev, we_event, &wrqu, msg); }if (!list_empty (&mac->events))
net/ieee80211/softmac/ieee80211softmac_io.c +15 -3
@@ -180,9 +180,21 @@ ieee80211softmac_assoc_req(struct ieee80ieee80211softmac_hdr_3addr (mac, &((*pkt)->header),IEEE80211_STYPE_ASSOC_REQ , net->bssid, net->bssid);/* Fill in capability Info */ - (*pkt)->capability = (mac->ieee->iw_mode ==IW_MODE_MASTER ) || (mac->ieee->iw_mode ==IW_MODE_INFRA ) ? -cpu_to_le16 (WLAN_CAPABILITY_ESS ) : -cpu_to_le16 (WLAN_CAPABILITY_IBSS ); +switch (mac->ieee->iw_mode) { +case IW_MODE_INFRA : + (*pkt)->capability =cpu_to_le16 (WLAN_CAPABILITY_ESS ); +break ; +case IW_MODE_ADHOC : + (*pkt)->capability =cpu_to_le16 (WLAN_CAPABILITY_IBSS ); +break ; +case IW_MODE_AUTO : + (*pkt)->capability = net->capabilities & (WLAN_CAPABILITY_ESS |WLAN_CAPABILITY_IBSS ); +break ; +default : +/* bleh. we don't ever go to these modes */ + printk(KERN_ERR PFX "invalid iw_mode!\n"); +break ; + }/* Need to add this (*pkt)->capability |= mac->ieee->short_slot ? cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME) : 0;
net/ieee80211/softmac/ieee80211softmac_scan.c +2 -0
@@ -47,6 +47,7 @@ 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);
@@ -239,6 +240,7 @@ 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);
net/ieee80211/softmac/ieee80211softmac_wx.c +10 -0
@@ -41,13 +41,23 @@ ieee80211softmac_wx_trigger_scan(structEXPORT_SYMBOL_GPL (ieee80211softmac_wx_trigger_scan); +/* if we're still scanning, return -EAGAIN so that userspace tools +* can get the complete scan results, otherwise return 0. */ int ieee80211softmac_wx_get_scan_results (struct net_device *net_dev,struct iw_request_info *info,union iwreq_data *data,char *extra) { +unsigned long flags;struct ieee80211softmac_device *sm =ieee80211_priv (net_dev); + +spin_lock_irqsave (&sm->lock, flags); +if (sm->scanning) { +spin_unlock_irqrestore (&sm->lock, flags); +return -EAGAIN ; + } +spin_unlock_irqrestore (&sm->lock, flags);return ieee80211_wx_get_scan (sm->ieee, info, data, extra); }EXPORT_SYMBOL_GPL (ieee80211softmac_wx_get_scan_results);