net driver fixes
Subsystems (4)
PATCH 1/1 net driver fixes
Please pull from 'upstream-fixes' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
to receive the following updates:
arch/ppc/syslib/mv64x60.c | 4 - drivers/net/acenic.c | 4 + drivers/net/b44.c | 5 + drivers/net/bonding/bond_main.c | 2 drivers/net/mv643xx_eth.c | 108 ++++++++++++++++---------------------- drivers/net/s2io.c | 2 drivers/net/wireless/orinoco_cs.c | 4 - include/net/ieee80211.h | 4 - net/ieee80211/ieee80211_rx.c | 22 +++++-- net/ieee80211/ieee80211_wx.c | 12 +++- 10 files changed, 89 insertions(+), 78 deletions(-)
Ananda Raju:
s2io: scatter-gather fix
Dale Farnsworth:
mv643xx_eth: Fix spinlock recursion bug
mv643xx_eth: Whitespace cleanup
mv643xx_eth: Fix for building as a module
Eric Sesterhenn:
bonding: fix ->get_settings error checking
acenic: fix checking of read_eeprom_byte() return values
Paolo Galtieri:
mv643xx_eth: Update dev->last_rx on packet receive
Stephen Hemminger:
b44: fix laptop carrier detect
[email protected]:
orinoco_cs: tweak Vcc debugging messages
Zhu Yi:
ieee80211: Fix problem with not decrypting broadcast packets
ieee80211: Fix iwlist scan can only show about 20 APs
ieee80211: Fix A band min and max channel definitions
arch/ppc/syslib/mv64x60.c +2 -2
@@ -313,7 +313,7 @@ static struct platform_device mpsc1_devi };#endif -#ifdef CONFIG_MV643XX_ETH +#if defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MODULE) static struct resource mv64x60_eth_shared_resources[] = { [0] = { .name = "ethernet shared base",
@@ -456,7 +456,7 @@ static struct platform_device *mv64x60_p &mpsc0_device, &mpsc1_device,#endif -#ifdef CONFIG_MV643XX_ETH +#if defined(CONFIG_MV643XX_ETH ) || defined(CONFIG_MV643XX_ETH_MODULE ) &mv64x60_eth_shared_device,#endif #ifdef CONFIG_MV643XX_ETH_0
drivers/net/acenic.c +4 -0
@@ -1002,6 +1002,8 @@ static int __devinit ace_init(struct net mac1 =0 ;for (i =0 ; i <4 ; i++) { +int tmp; + mac1 = mac1 <<8 ; tmp =read_eeprom_byte (dev,0x8c +i);if (tmp <0 ) {
@@ -1012,6 +1014,8 @@ static int __devinit ace_init(struct net } mac2 =0 ;for (i =4 ; i <8 ; i++) { +int tmp; + mac2 = mac2 <<8 ; tmp =read_eeprom_byte (dev,0x8c +i);if (tmp <0 ) {
drivers/net/b44.c +3 -2
@@ -1399,7 +1399,6 @@ static int b44_open(struct net_device *db44_init_rings (bp);b44_init_hw (bp); -netif_carrier_off (dev);b44_check_phy (bp); err =request_irq (dev->irq, b44_interrupt,SA_SHIRQ , dev->name, dev);
@@ -1464,7 +1463,7 @@ static int b44_close(struct net_device *#endif b44_halt (bp);b44_free_rings (bp); -netif_carrier_off (bp->dev); +netif_carrier_off (dev);spin_unlock_irq (&bp->lock);
@@ -2000,6 +1999,8 @@ static int __devinit b44_init_one(struct dev->irq = pdev->irq;SET_ETHTOOL_OPS (dev, &b44_ethtool_ops); +netif_carrier_off (dev); + err =b44_get_invariants (bp);if (err) { printk(KERN_ERR PFX "Problem fetching invariants of chip, "
drivers/net/bonding/bond_main.c +1 -1
@@ -576,7 +576,7 @@ static int bond_update_speed_duplex(stru slave->duplex =DUPLEX_FULL ;if (slave_dev->ethtool_ops) { -u32 res; +int res;if (!slave_dev->ethtool_ops->get_settings) {return -1 ;
drivers/net/mv643xx_eth.c +47 -61
221 lines not on this page · raw message
drivers/net/s2io.c +1 -1
@@ -3586,7 +3586,7 @@ static int s2io_xmit(struct sk_buff *skb txdp->Buffer_Pointer = (u64 )pci_map_page (sp->pdev, frag->page, frag->page_offset, frag->size,PCI_DMA_TODEVICE ); - txdp->Control_1 |=TXD_BUFFER0_SIZE (frag->size); + txdp->Control_1 =TXD_BUFFER0_SIZE (frag->size);if (skb_shinfo (skb)->ufo_size) txdp->Control_1 |=TXD_UFO_EN ; }
drivers/net/wireless/orinoco_cs.c +2 -2
@@ -261,13 +261,13 @@ orinoco_cs_config(dev_link_t *link)/* Note that the CIS values need to be rescaled */ if (cfg->vcc.present & (1 <<CISTPL_POWER_VNOM )) {if (conf.Vcc != cfg->vcc.param[CISTPL_POWER_VNOM ] /10000 ) { -DEBUG (2 ,"orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n" , conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM ] /10000 ); +DEBUG (2 ,"orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, cfg CIS = %d)\n" , conf.Vcc, cfg->vcc.param[CISTPL_POWER_VNOM ] /10000 );if (!ignore_cis_vcc) goto next_entry; } }else if (dflt.vcc.present & (1 <<CISTPL_POWER_VNOM )) {if (conf.Vcc != dflt.vcc.param[CISTPL_POWER_VNOM ] /10000 ) { -DEBUG (2 ,"orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, CIS = %d)\n" , conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM ] /10000 ); +DEBUG (2 ,"orinoco_cs_config: Vcc mismatch (conf.Vcc = %d, dflt CIS = %d)\n" , conf.Vcc, dflt.vcc.param[CISTPL_POWER_VNOM ] /10000 );if (!ignore_cis_vcc) goto next_entry; }
include/net/ieee80211.h +2 -2
@@ -803,9 +803,9 @@ enum ieee80211_state {#define IEEE80211_24GHZ_MAX_CHANNEL 14#define IEEE80211_24GHZ_CHANNELS 14 -#define IEEE80211_52GHZ_MIN_CHANNEL 36 +#define IEEE80211_52GHZ_MIN_CHANNEL 34#define IEEE80211_52GHZ_MAX_CHANNEL 165 -#define IEEE80211_52GHZ_CHANNELS 32 +#define IEEE80211_52GHZ_CHANNELS 131enum {IEEE80211_CH_PASSIVE_ONLY = (1 <<0 ),
net/ieee80211/ieee80211_rx.c +17 -5
@@ -350,6 +350,7 @@ int ieee80211_rx(struct ieee80211_deviceu8 src[ETH_ALEN ];struct ieee80211_crypt_data *crypt =NULL ;int keyidx =0 ; +int can_be_decrypted =0 ; hdr = (struct ieee80211_hdr_4addr *)skb->data; stats = &ieee->stats;
@@ -410,12 +411,23 @@ int ieee80211_rx(struct ieee80211_devicereturn 1 ; } -if (is_multicast_ether_addr (hdr->addr1) - ? ieee->host_mc_decrypt : ieee->host_decrypt) { + can_be_decrypted = (is_multicast_ether_addr (hdr->addr1) || +is_broadcast_ether_addr (hdr->addr2)) ? + ieee->host_mc_decrypt : ieee->host_decrypt; + +if (can_be_decrypted) {int idx =0 ; -if (skb->len >= hdrlen +3 ) +if (skb->len >= hdrlen +3 ) { +/* Top two-bits of byte 3 are the key index */ idx = skb->data[hdrlen +3 ] >>6 ; + } + +/* ieee->crypt[] is WEP_KEY (4) in length. Given that idx +* is only allowed 2-bits of storage, no value of idx can +* be provided via above code that would result in idx +* being out of range */ crypt = ieee->crypt[idx]; +#ifdef NOT_YET sta =NULL ;
@@ -553,7 +565,7 @@ int ieee80211_rx(struct ieee80211_device/* skb: hdr + (possibly fragmented, possibly encrypted) payload */ -if (ieee->host_decrypt && (fc &IEEE80211_FCTL_PROTECTED ) && +if ((fc &IEEE80211_FCTL_PROTECTED ) && can_be_decrypted && (keyidx =ieee80211_rx_frame_decrypt (ieee, skb, crypt)) <0 ) goto rx_dropped;
@@ -617,7 +629,7 @@ int ieee80211_rx(struct ieee80211_device/* skb: hdr + (possible reassembled) full MSDU payload; possibly still * encrypted/authenticated */ -if (ieee->host_decrypt && (fc &IEEE80211_FCTL_PROTECTED ) && +if ((fc &IEEE80211_FCTL_PROTECTED ) && can_be_decrypted &&ieee80211_rx_frame_decrypt_msdu (ieee, skb, keyidx, crypt)) goto rx_dropped;
net/ieee80211/ieee80211_wx.c +10 -2
@@ -232,15 +232,18 @@ static char *ipw2100_translate_scan(strureturn start; } +#define SCAN_ITEM_SIZE 128 +int ieee80211_wx_get_scan (struct ieee80211_device *ieee,struct iw_request_info *info,union iwreq_data *wrqu,char *extra) {struct ieee80211_network *network;unsigned long flags; +int err =0 ;char *ev = extra; -char *stop = ev +IW_SCAN_MAX_DATA ; +char *stop = ev + wrqu->data.length;int i =0 ;IEEE80211_DEBUG_WX ("Getting scan\n" );
@@ -249,6 +252,11 @@ int ieee80211_wx_get_scan(struct ieee802list_for_each_entry (network, &ieee->network_list, list) { i++; +if (stop - ev <SCAN_ITEM_SIZE ) { + err = -E2BIG ; +break ; + } +if (ieee->scan_age ==0 ||time_after (network->last_scanned + ieee->scan_age, jiffies)) ev =ipw2100_translate_scan (ieee, ev, stop, network);
@@ -270,7 +278,7 @@ int ieee80211_wx_get_scan(struct ieee802IEEE80211_DEBUG_WX ("exit: %d networks returned.\n" , i); -return 0 ; +return err; } int ieee80211_wx_set_encode(struct ieee80211_device *ieee,