evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

Browse source
This commit is contained in:
Linus Torvalds 2005-09-07 17:22:43 -07:00
commit 55faed1e60
38 changed files with 5355 additions and 2304 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/net/Kconfig
View file

@ -2058,6 +2058,13 @@ config BNX2
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called bnx2. This is recommended. will be called bnx2. This is recommended.
config SPIDER_NET
tristate "Spider Gigabit Ethernet driver"
depends on PCI && PPC_BPA
help
This driver supports the Gigabit Ethernet chips present on the
Cell Processor-Based Blades from IBM.
config GIANFAR config GIANFAR
tristate "Gianfar Ethernet" tristate "Gianfar Ethernet"
depends on 85xx || 83xx depends on 85xx || 83xx

2
drivers/net/Makefile
View file

@ -54,6 +54,8 @@ obj-$(CONFIG_STNIC) += stnic.o 8390.o
obj-$(CONFIG_FEALNX) += fealnx.o obj-$(CONFIG_FEALNX) += fealnx.o
obj-$(CONFIG_TIGON3) += tg3.o obj-$(CONFIG_TIGON3) += tg3.o
obj-$(CONFIG_BNX2) += bnx2.o obj-$(CONFIG_BNX2) += bnx2.o
spidernet-y += spider_net.o spider_net_ethtool.o sungem_phy.o
obj-$(CONFIG_SPIDER_NET) += spidernet.o
obj-$(CONFIG_TC35815) += tc35815.o obj-$(CONFIG_TC35815) += tc35815.o
obj-$(CONFIG_SKGE) += skge.o obj-$(CONFIG_SKGE) += skge.o
obj-$(CONFIG_SK98LIN) += sk98lin/ obj-$(CONFIG_SK98LIN) += sk98lin/

2
drivers/net/ac3200.c
View file

@ -275,7 +275,7 @@ static int __init ac_probe1(int ioaddr, struct net_device *dev)
return 0; return 0;
out2: out2:
if (ei_status.reg0) if (ei_status.reg0)
iounmap((void *)dev->mem_start); iounmap(ei_status.mem);
out1: out1:
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
out: out:

2
drivers/net/atarilance.c
View file

@ -235,7 +235,7 @@ struct lance_private {
#define MEM lp->mem #define MEM lp->mem
#define DREG IO->data #define DREG IO->data
#define AREG IO->addr #define AREG IO->addr
#define REGA(a) ( AREG = (a), DREG ) #define REGA(a) (*( AREG = (a), &DREG ))
/* Definitions for packet buffer access: */ /* Definitions for packet buffer access: */
#define PKT_BUF_SZ 1544 #define PKT_BUF_SZ 1544

2
drivers/net/dm9000.c
View file

@ -1140,7 +1140,7 @@ dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg, int value)
} }
static int static int
dm9000_drv_suspend(struct device *dev, u32 state, u32 level) dm9000_drv_suspend(struct device *dev, pm_message_t state, u32 level)
{ {
struct net_device *ndev = dev_get_drvdata(dev); struct net_device *ndev = dev_get_drvdata(dev);

4
drivers/net/forcedeth.c
View file

@ -1372,7 +1372,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu)
/* synchronized against open : rtnl_lock() held by caller */ /* synchronized against open : rtnl_lock() held by caller */
if (netif_running(dev)) { if (netif_running(dev)) {
u8 *base = get_hwbase(dev); u8 __iomem *base = get_hwbase(dev);
/* /*
* It seems that the nic preloads valid ring entries into an * It seems that the nic preloads valid ring entries into an
* internal buffer. The procedure for flushing everything is * internal buffer. The procedure for flushing everything is
@ -1423,7 +1423,7 @@ static int nv_change_mtu(struct net_device *dev, int new_mtu)
static void nv_copy_mac_to_hw(struct net_device *dev) static void nv_copy_mac_to_hw(struct net_device *dev)
{ {
u8 *base = get_hwbase(dev); u8 __iomem *base = get_hwbase(dev);
u32 mac[2]; u32 mac[2];
mac[0] = (dev->dev_addr[0] << 0) + (dev->dev_addr[1] << 8) + mac[0] = (dev->dev_addr[0] << 0) + (dev->dev_addr[1] << 8) +

1
drivers/net/iseries_veth.c
View file

@ -4,6 +4,7 @@
* Copyright (C) 2001 Kyle A. Lucke (klucke@us.ibm.com), IBM Corp. * Copyright (C) 2001 Kyle A. Lucke (klucke@us.ibm.com), IBM Corp.
* Substantially cleaned up by: * Substantially cleaned up by:
* Copyright (C) 2003 David Gibson <dwg@au1.ibm.com>, IBM Corporation. * Copyright (C) 2003 David Gibson <dwg@au1.ibm.com>, IBM Corporation.
* Copyright (C) 2004-2005 Michael Ellerman, IBM Corporation.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as

13
drivers/net/s2io-regs.h
View file

@ -1,5 +1,5 @@
/************************************************************************ /************************************************************************
* regs.h: A Linux PCI-X Ethernet driver for S2IO 10GbE Server NIC * regs.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
* Copyright(c) 2002-2005 Neterion Inc. * Copyright(c) 2002-2005 Neterion Inc.
* This software may be used and distributed according to the terms of * This software may be used and distributed according to the terms of
@ -713,13 +713,16 @@ typedef struct _XENA_dev_config {
u64 mc_err_reg; u64 mc_err_reg;
#define MC_ERR_REG_ECC_DB_ERR_L BIT(14) #define MC_ERR_REG_ECC_DB_ERR_L BIT(14)
#define MC_ERR_REG_ECC_DB_ERR_U BIT(15) #define MC_ERR_REG_ECC_DB_ERR_U BIT(15)
#define MC_ERR_REG_MIRI_ECC_DB_ERR_0 BIT(18)
#define MC_ERR_REG_MIRI_ECC_DB_ERR_1 BIT(20)
#define MC_ERR_REG_MIRI_CRI_ERR_0 BIT(22) #define MC_ERR_REG_MIRI_CRI_ERR_0 BIT(22)
#define MC_ERR_REG_MIRI_CRI_ERR_1 BIT(23) #define MC_ERR_REG_MIRI_CRI_ERR_1 BIT(23)
#define MC_ERR_REG_SM_ERR BIT(31) #define MC_ERR_REG_SM_ERR BIT(31)
#define MC_ERR_REG_ECC_ALL_SNG (BIT(6) | \ #define MC_ERR_REG_ECC_ALL_SNG (BIT(2) | BIT(3) | BIT(4) | BIT(5) |\
BIT(7) | BIT(17) | BIT(19)) BIT(6) | BIT(7) | BIT(17) | BIT(19))
#define MC_ERR_REG_ECC_ALL_DBL (BIT(14) | \ #define MC_ERR_REG_ECC_ALL_DBL (BIT(10) | BIT(11) | BIT(12) |\
BIT(15) | BIT(18) | BIT(20)) BIT(13) | BIT(14) | BIT(15) |\
BIT(18) | BIT(20))
u64 mc_err_mask; u64 mc_err_mask;
u64 mc_err_alarm; u64 mc_err_alarm;

94
drivers/net/s2io.c
View file

@ -1,5 +1,5 @@
/************************************************************************ /************************************************************************
* s2io.c: A Linux PCI-X Ethernet driver for S2IO 10GbE Server NIC * s2io.c: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
* Copyright(c) 2002-2005 Neterion Inc. * Copyright(c) 2002-2005 Neterion Inc.
* This software may be used and distributed according to the terms of * This software may be used and distributed according to the terms of
@ -28,7 +28,7 @@
* explaination of all the variables. * explaination of all the variables.
* rx_ring_num : This can be used to program the number of receive rings used * rx_ring_num : This can be used to program the number of receive rings used
* in the driver. * in the driver.
* rx_ring_len: This defines the number of descriptors each ring can have. This * rx_ring_sz: This defines the number of descriptors each ring can have. This
* is also an array of size 8. * is also an array of size 8.
* tx_fifo_num: This defines the number of Tx FIFOs thats used int the driver. * tx_fifo_num: This defines the number of Tx FIFOs thats used int the driver.
* tx_fifo_len: This too is an array of 8. Each element defines the number of * tx_fifo_len: This too is an array of 8. Each element defines the number of
@ -67,7 +67,7 @@
/* S2io Driver name & version. */ /* S2io Driver name & version. */
static char s2io_driver_name[] = "Neterion"; static char s2io_driver_name[] = "Neterion";
static char s2io_driver_version[] = "Version 2.0.3.1"; static char s2io_driver_version[] = "Version 2.0.8.1";
static inline int RXD_IS_UP2DT(RxD_t *rxdp) static inline int RXD_IS_UP2DT(RxD_t *rxdp)
{ {
@ -404,7 +404,7 @@ static int init_shared_mem(struct s2io_nic *nic)
config->tx_cfg[i].fifo_len - 1; config->tx_cfg[i].fifo_len - 1;
mac_control->fifos[i].fifo_no = i; mac_control->fifos[i].fifo_no = i;
mac_control->fifos[i].nic = nic; mac_control->fifos[i].nic = nic;
mac_control->fifos[i].max_txds = MAX_SKB_FRAGS; mac_control->fifos[i].max_txds = MAX_SKB_FRAGS + 1;
for (j = 0; j < page_num; j++) { for (j = 0; j < page_num; j++) {
int k = 0; int k = 0;
@ -418,6 +418,26 @@ static int init_shared_mem(struct s2io_nic *nic)
DBG_PRINT(ERR_DBG, "failed for TxDL\n"); DBG_PRINT(ERR_DBG, "failed for TxDL\n");
return -ENOMEM; return -ENOMEM;
} }
/* If we got a zero DMA address(can happen on
* certain platforms like PPC), reallocate.
* Store virtual address of page we don't want,
* to be freed later.
*/
if (!tmp_p) {
mac_control->zerodma_virt_addr = tmp_v;
DBG_PRINT(INIT_DBG,
"%s: Zero DMA address for TxDL. ", dev->name);
DBG_PRINT(INIT_DBG,
"Virtual address %llx\n", (u64)tmp_v);
tmp_v = pci_alloc_consistent(nic->pdev,
PAGE_SIZE, &tmp_p);
if (!tmp_v) {
DBG_PRINT(ERR_DBG,
"pci_alloc_consistent ");
DBG_PRINT(ERR_DBG, "failed for TxDL\n");
return -ENOMEM;
}
}
while (k < lst_per_page) { while (k < lst_per_page) {
int l = (j * lst_per_page) + k; int l = (j * lst_per_page) + k;
if (l == config->tx_cfg[i].fifo_len) if (l == config->tx_cfg[i].fifo_len)
@ -600,7 +620,7 @@ static void free_shared_mem(struct s2io_nic *nic)
mac_info_t *mac_control; mac_info_t *mac_control;
struct config_param *config; struct config_param *config;
int lst_size, lst_per_page; int lst_size, lst_per_page;
struct net_device *dev = nic->dev;
if (!nic) if (!nic)
return; return;
@ -616,9 +636,10 @@ static void free_shared_mem(struct s2io_nic *nic)
lst_per_page); lst_per_page);
for (j = 0; j < page_num; j++) { for (j = 0; j < page_num; j++) {
int mem_blks = (j * lst_per_page); int mem_blks = (j * lst_per_page);
if ((!mac_control->fifos[i].list_info) || if (!mac_control->fifos[i].list_info)
(!mac_control->fifos[i].list_info[mem_blks]. return;
list_virt_addr)) if (!mac_control->fifos[i].list_info[mem_blks].
list_virt_addr)
break; break;
pci_free_consistent(nic->pdev, PAGE_SIZE, pci_free_consistent(nic->pdev, PAGE_SIZE,
mac_control->fifos[i]. mac_control->fifos[i].
@ -628,6 +649,18 @@ static void free_shared_mem(struct s2io_nic *nic)
list_info[mem_blks]. list_info[mem_blks].
list_phy_addr); list_phy_addr);
} }
/* If we got a zero DMA address during allocation,
* free the page now
*/
if (mac_control->zerodma_virt_addr) {
pci_free_consistent(nic->pdev, PAGE_SIZE,
mac_control->zerodma_virt_addr,
(dma_addr_t)0);
DBG_PRINT(INIT_DBG,
"%s: Freeing TxDL with zero DMA addr. ", dev->name);
DBG_PRINT(INIT_DBG, "Virtual address %llx\n",
(u64)(mac_control->zerodma_virt_addr));
}
kfree(mac_control->fifos[i].list_info); kfree(mac_control->fifos[i].list_info);
} }
@ -2479,9 +2512,10 @@ static void rx_intr_handler(ring_info_t *ring_data)
#endif #endif
spin_lock(&nic->rx_lock); spin_lock(&nic->rx_lock);
if (atomic_read(&nic->card_state) == CARD_DOWN) { if (atomic_read(&nic->card_state) == CARD_DOWN) {
DBG_PRINT(ERR_DBG, "%s: %s going down for reset\n", DBG_PRINT(INTR_DBG, "%s: %s going down for reset\n",
__FUNCTION__, dev->name); __FUNCTION__, dev->name);
spin_unlock(&nic->rx_lock); spin_unlock(&nic->rx_lock);
return;
} }
get_info = ring_data->rx_curr_get_info; get_info = ring_data->rx_curr_get_info;
@ -2596,8 +2630,14 @@ static void tx_intr_handler(fifo_info_t *fifo_data)
if (txdlp->Control_1 & TXD_T_CODE) { if (txdlp->Control_1 & TXD_T_CODE) {
unsigned long long err; unsigned long long err;
err = txdlp->Control_1 & TXD_T_CODE; err = txdlp->Control_1 & TXD_T_CODE;
DBG_PRINT(ERR_DBG, "***TxD error %llx\n", if ((err >> 48) == 0xA) {
err); DBG_PRINT(TX_DBG, "TxD returned due \
to loss of link\n");
}
else {
DBG_PRINT(ERR_DBG, "***TxD error \
%llx\n", err);
}
} }
skb = (struct sk_buff *) ((unsigned long) skb = (struct sk_buff *) ((unsigned long)
@ -2689,13 +2729,17 @@ static void alarm_intr_handler(struct s2io_nic *nic)
if (val64 & MC_ERR_REG_ECC_ALL_DBL) { if (val64 & MC_ERR_REG_ECC_ALL_DBL) {
nic->mac_control.stats_info->sw_stat. nic->mac_control.stats_info->sw_stat.
double_ecc_errs++; double_ecc_errs++;
DBG_PRINT(ERR_DBG, "%s: Device indicates ", DBG_PRINT(INIT_DBG, "%s: Device indicates ",
dev->name); dev->name);
DBG_PRINT(ERR_DBG, "double ECC error!!\n"); DBG_PRINT(INIT_DBG, "double ECC error!!\n");
if (nic->device_type != XFRAME_II_DEVICE) { if (nic->device_type != XFRAME_II_DEVICE) {
/* Reset XframeI only if critical error */
if (val64 & (MC_ERR_REG_MIRI_ECC_DB_ERR_0 |
MC_ERR_REG_MIRI_ECC_DB_ERR_1)) {
netif_stop_queue(dev); netif_stop_queue(dev);
schedule_work(&nic->rst_timer_task); schedule_work(&nic->rst_timer_task);
} }
}
} else { } else {
nic->mac_control.stats_info->sw_stat. nic->mac_control.stats_info->sw_stat.
single_ecc_errs++; single_ecc_errs++;
@ -2706,7 +2750,8 @@ static void alarm_intr_handler(struct s2io_nic *nic)
val64 = readq(&bar0->serr_source); val64 = readq(&bar0->serr_source);
if (val64 & SERR_SOURCE_ANY) { if (val64 & SERR_SOURCE_ANY) {
DBG_PRINT(ERR_DBG, "%s: Device indicates ", dev->name); DBG_PRINT(ERR_DBG, "%s: Device indicates ", dev->name);
DBG_PRINT(ERR_DBG, "serious error!!\n"); DBG_PRINT(ERR_DBG, "serious error %llx!!\n",
(unsigned long long)val64);
netif_stop_queue(dev); netif_stop_queue(dev);
schedule_work(&nic->rst_timer_task); schedule_work(&nic->rst_timer_task);
} }
@ -3130,7 +3175,7 @@ int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
queue_len = mac_control->fifos[queue].tx_curr_put_info.fifo_len + 1; queue_len = mac_control->fifos[queue].tx_curr_put_info.fifo_len + 1;
/* Avoid "put" pointer going beyond "get" pointer */ /* Avoid "put" pointer going beyond "get" pointer */
if (txdp->Host_Control || (((put_off + 1) % queue_len) == get_off)) { if (txdp->Host_Control || (((put_off + 1) % queue_len) == get_off)) {
DBG_PRINT(ERR_DBG, "Error in xmit, No free TXDs.\n"); DBG_PRINT(TX_DBG, "Error in xmit, No free TXDs.\n");
netif_stop_queue(dev); netif_stop_queue(dev);
dev_kfree_skb(skb); dev_kfree_skb(skb);
spin_unlock_irqrestore(&sp->tx_lock, flags); spin_unlock_irqrestore(&sp->tx_lock, flags);
@ -3528,7 +3573,7 @@ static void s2io_set_multicast(struct net_device *dev)
val64 = readq(&bar0->mac_cfg); val64 = readq(&bar0->mac_cfg);
sp->promisc_flg = 1; sp->promisc_flg = 1;
DBG_PRINT(ERR_DBG, "%s: entered promiscuous mode\n", DBG_PRINT(INFO_DBG, "%s: entered promiscuous mode\n",
dev->name); dev->name);
} else if (!(dev->flags & IFF_PROMISC) && (sp->promisc_flg)) { } else if (!(dev->flags & IFF_PROMISC) && (sp->promisc_flg)) {
/* Remove the NIC from promiscuous mode */ /* Remove the NIC from promiscuous mode */
@ -3543,7 +3588,7 @@ static void s2io_set_multicast(struct net_device *dev)
val64 = readq(&bar0->mac_cfg); val64 = readq(&bar0->mac_cfg);
sp->promisc_flg = 0; sp->promisc_flg = 0;
DBG_PRINT(ERR_DBG, "%s: left promiscuous mode\n", DBG_PRINT(INFO_DBG, "%s: left promiscuous mode\n",
dev->name); dev->name);
} }
@ -5325,7 +5370,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
break; break;
} }
} }
config->max_txds = MAX_SKB_FRAGS; config->max_txds = MAX_SKB_FRAGS + 1;
/* Rx side parameters. */ /* Rx side parameters. */
if (rx_ring_sz[0] == 0) if (rx_ring_sz[0] == 0)
@ -5525,9 +5570,14 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
if (sp->device_type & XFRAME_II_DEVICE) { if (sp->device_type & XFRAME_II_DEVICE) {
DBG_PRINT(ERR_DBG, "%s: Neterion Xframe II 10GbE adapter ", DBG_PRINT(ERR_DBG, "%s: Neterion Xframe II 10GbE adapter ",
dev->name); dev->name);
DBG_PRINT(ERR_DBG, "(rev %d), Driver %s\n", DBG_PRINT(ERR_DBG, "(rev %d), %s",
get_xena_rev_id(sp->pdev), get_xena_rev_id(sp->pdev),
s2io_driver_version); s2io_driver_version);
#ifdef CONFIG_2BUFF_MODE
DBG_PRINT(ERR_DBG, ", Buffer mode %d",2);
#endif
DBG_PRINT(ERR_DBG, "\nCopyright(c) 2002-2005 Neterion Inc.\n");
DBG_PRINT(ERR_DBG, "MAC ADDR: %02x:%02x:%02x:%02x:%02x:%02x\n", DBG_PRINT(ERR_DBG, "MAC ADDR: %02x:%02x:%02x:%02x:%02x:%02x\n",
sp->def_mac_addr[0].mac_addr[0], sp->def_mac_addr[0].mac_addr[0],
sp->def_mac_addr[0].mac_addr[1], sp->def_mac_addr[0].mac_addr[1],
@ -5544,9 +5594,13 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
} else { } else {
DBG_PRINT(ERR_DBG, "%s: Neterion Xframe I 10GbE adapter ", DBG_PRINT(ERR_DBG, "%s: Neterion Xframe I 10GbE adapter ",
dev->name); dev->name);
DBG_PRINT(ERR_DBG, "(rev %d), Driver %s\n", DBG_PRINT(ERR_DBG, "(rev %d), %s",
get_xena_rev_id(sp->pdev), get_xena_rev_id(sp->pdev),
s2io_driver_version); s2io_driver_version);
#ifdef CONFIG_2BUFF_MODE
DBG_PRINT(ERR_DBG, ", Buffer mode %d",2);
#endif
DBG_PRINT(ERR_DBG, "\nCopyright(c) 2002-2005 Neterion Inc.\n");
DBG_PRINT(ERR_DBG, "MAC ADDR: %02x:%02x:%02x:%02x:%02x:%02x\n", DBG_PRINT(ERR_DBG, "MAC ADDR: %02x:%02x:%02x:%02x:%02x:%02x\n",
sp->def_mac_addr[0].mac_addr[0], sp->def_mac_addr[0].mac_addr[0],
sp->def_mac_addr[0].mac_addr[1], sp->def_mac_addr[0].mac_addr[1],

5
drivers/net/s2io.h
View file

@ -1,5 +1,5 @@
/************************************************************************ /************************************************************************
* s2io.h: A Linux PCI-X Ethernet driver for S2IO 10GbE Server NIC * s2io.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
* Copyright(c) 2002-2005 Neterion Inc. * Copyright(c) 2002-2005 Neterion Inc.
* This software may be used and distributed according to the terms of * This software may be used and distributed according to the terms of
@ -622,6 +622,9 @@ typedef struct mac_info {
/* Fifo specific structure */ /* Fifo specific structure */
fifo_info_t fifos[MAX_TX_FIFOS]; fifo_info_t fifos[MAX_TX_FIFOS];
/* Save virtual address of TxD page with zero DMA addr(if any) */
void *zerodma_virt_addr;
/* rx side stuff */ /* rx side stuff */
/* Ring specific structure */ /* Ring specific structure */
ring_info_t rings[MAX_RX_RINGS]; ring_info_t rings[MAX_RX_RINGS];

2334
drivers/net/spider_net.c Normal file
View file

File diff suppressed because it is too large Load diff

469
drivers/net/spider_net.h Normal file
View file

@ -0,0 +1,469 @@
/*
* Network device driver for Cell Processor-Based Blade
*
* (C) Copyright IBM Corp. 2005
*
* Authors : Utz Bacher <utz.bacher@de.ibm.com>
* Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
*
* 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
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef _SPIDER_NET_H
#define _SPIDER_NET_H
#include "sungem_phy.h"
extern int spider_net_stop(struct net_device *netdev);
extern int spider_net_open(struct net_device *netdev);
extern struct ethtool_ops spider_net_ethtool_ops;
extern char spider_net_driver_name[];
#define SPIDER_NET_MAX_MTU 2308
#define SPIDER_NET_MIN_MTU 64
#define SPIDER_NET_RXBUF_ALIGN 128
#define SPIDER_NET_RX_DESCRIPTORS_DEFAULT 64
#define SPIDER_NET_RX_DESCRIPTORS_MIN 16
#define SPIDER_NET_RX_DESCRIPTORS_MAX 256
#define SPIDER_NET_TX_DESCRIPTORS_DEFAULT 64
#define SPIDER_NET_TX_DESCRIPTORS_MIN 16
#define SPIDER_NET_TX_DESCRIPTORS_MAX 256
#define SPIDER_NET_RX_CSUM_DEFAULT 1
#define SPIDER_NET_WATCHDOG_TIMEOUT 5*HZ
#define SPIDER_NET_NAPI_WEIGHT 64
#define SPIDER_NET_FIRMWARE_LEN 1024
#define SPIDER_NET_FIRMWARE_NAME "spider_fw.bin"
/** spider_net SMMIO registers */
#define SPIDER_NET_GHIINT0STS 0x00000000
#define SPIDER_NET_GHIINT1STS 0x00000004
#define SPIDER_NET_GHIINT2STS 0x00000008
#define SPIDER_NET_GHIINT0MSK 0x00000010
#define SPIDER_NET_GHIINT1MSK 0x00000014
#define SPIDER_NET_GHIINT2MSK 0x00000018
#define SPIDER_NET_GRESUMINTNUM 0x00000020
#define SPIDER_NET_GREINTNUM 0x00000024
#define SPIDER_NET_GFFRMNUM 0x00000028
#define SPIDER_NET_GFAFRMNUM 0x0000002c
#define SPIDER_NET_GFBFRMNUM 0x00000030
#define SPIDER_NET_GFCFRMNUM 0x00000034
#define SPIDER_NET_GFDFRMNUM 0x00000038
/* clear them (don't use it) */
#define SPIDER_NET_GFREECNNUM 0x0000003c
#define SPIDER_NET_GONETIMENUM 0x00000040
#define SPIDER_NET_GTOUTFRMNUM 0x00000044
#define SPIDER_NET_GTXMDSET 0x00000050
#define SPIDER_NET_GPCCTRL 0x00000054
#define SPIDER_NET_GRXMDSET 0x00000058
#define SPIDER_NET_GIPSECINIT 0x0000005c
#define SPIDER_NET_GFTRESTRT 0x00000060
#define SPIDER_NET_GRXDMAEN 0x00000064
#define SPIDER_NET_GMRWOLCTRL 0x00000068
#define SPIDER_NET_GPCWOPCMD 0x0000006c
#define SPIDER_NET_GPCROPCMD 0x00000070
#define SPIDER_NET_GTTFRMCNT 0x00000078
#define SPIDER_NET_GTESTMD 0x0000007c
#define SPIDER_NET_GSINIT 0x00000080
#define SPIDER_NET_GSnPRGADR 0x00000084
#define SPIDER_NET_GSnPRGDAT 0x00000088
#define SPIDER_NET_GMACOPEMD 0x00000100
#define SPIDER_NET_GMACLENLMT 0x00000108
#define SPIDER_NET_GMACINTEN 0x00000118
#define SPIDER_NET_GMACPHYCTRL 0x00000120
#define SPIDER_NET_GMACAPAUSE 0x00000154
#define SPIDER_NET_GMACTXPAUSE 0x00000164
#define SPIDER_NET_GMACMODE 0x000001b0
#define SPIDER_NET_GMACBSTLMT 0x000001b4
#define SPIDER_NET_GMACUNIMACU 0x000001c0
#define SPIDER_NET_GMACUNIMACL 0x000001c8
#define SPIDER_NET_GMRMHFILnR 0x00000400
#define SPIDER_NET_MULTICAST_HASHES 256
#define SPIDER_NET_GMRUAFILnR 0x00000500
#define SPIDER_NET_GMRUA0FIL15R 0x00000578
/* RX DMA controller registers, all 0x00000a.. are for DMA controller A,
* 0x00000b.. for DMA controller B, etc. */
#define SPIDER_NET_GDADCHA 0x00000a00
#define SPIDER_NET_GDADMACCNTR 0x00000a04
#define SPIDER_NET_GDACTDPA 0x00000a08
#define SPIDER_NET_GDACTDCNT 0x00000a0c
#define SPIDER_NET_GDACDBADDR 0x00000a20
#define SPIDER_NET_GDACDBSIZE 0x00000a24
#define SPIDER_NET_GDACNEXTDA 0x00000a28
#define SPIDER_NET_GDACCOMST 0x00000a2c
#define SPIDER_NET_GDAWBCOMST 0x00000a30
#define SPIDER_NET_GDAWBRSIZE 0x00000a34
#define SPIDER_NET_GDAWBVSIZE 0x00000a38
#define SPIDER_NET_GDAWBTRST 0x00000a3c
#define SPIDER_NET_GDAWBTRERR 0x00000a40
/* TX DMA controller registers */
#define SPIDER_NET_GDTDCHA 0x00000e00
#define SPIDER_NET_GDTDMACCNTR 0x00000e04
#define SPIDER_NET_GDTCDPA 0x00000e08
#define SPIDER_NET_GDTDMASEL 0x00000e14
#define SPIDER_NET_ECMODE 0x00000f00
/* clock and reset control register */
#define SPIDER_NET_CKRCTRL 0x00000ff0
/** SCONFIG registers */
#define SPIDER_NET_SCONFIG_IOACTE 0x00002810
/** hardcoded register values */
#define SPIDER_NET_INT0_MASK_VALUE 0x3f7fe3ff
#define SPIDER_NET_INT1_MASK_VALUE 0xffffffff
/* no MAC aborts -> auto retransmission */
#define SPIDER_NET_INT2_MASK_VALUE 0xfffffff1
/* clear counter when interrupt sources are cleared
#define SPIDER_NET_FRAMENUM_VALUE 0x0001f001 */
/* we rely on flagged descriptor interrupts */
#define SPIDER_NET_FRAMENUM_VALUE 0x00000000
/* set this first, then the FRAMENUM_VALUE */
#define SPIDER_NET_GFXFRAMES_VALUE 0x00000000
#define SPIDER_NET_STOP_SEQ_VALUE 0x00000000
#define SPIDER_NET_RUN_SEQ_VALUE 0x0000007e
#define SPIDER_NET_PHY_CTRL_VALUE 0x00040040
/* #define SPIDER_NET_PHY_CTRL_VALUE 0x01070080*/
#define SPIDER_NET_RXMODE_VALUE 0x00000011
/* auto retransmission in case of MAC aborts */
#define SPIDER_NET_TXMODE_VALUE 0x00010000
#define SPIDER_NET_RESTART_VALUE 0x00000000
#define SPIDER_NET_WOL_VALUE 0x00001111
#if 0
#define SPIDER_NET_WOL_VALUE 0x00000000
#endif
#define SPIDER_NET_IPSECINIT_VALUE 0x00f000f8
/* pause frames: automatic, no upper retransmission count */
/* outside loopback mode: ETOMOD signal dont matter, not connected */
#define SPIDER_NET_OPMODE_VALUE 0x00000063
/*#define SPIDER_NET_OPMODE_VALUE 0x001b0062*/
#define SPIDER_NET_LENLMT_VALUE 0x00000908
#define SPIDER_NET_MACAPAUSE_VALUE 0x00000800 /* about 1 ms */
#define SPIDER_NET_TXPAUSE_VALUE 0x00000000
#define SPIDER_NET_MACMODE_VALUE 0x00000001
#define SPIDER_NET_BURSTLMT_VALUE 0x00000200 /* about 16 us */
/* 1(0) enable r/tx dma
* 0000000 fixed to 0
*
* 000000 fixed to 0
* 0(1) en/disable descr writeback on force end
* 0(1) force end
*
* 000000 fixed to 0
* 00 burst alignment: 128 bytes
*
* 00000 fixed to 0
* 0 descr writeback size 32 bytes
* 0(1) descr chain end interrupt enable
* 0(1) descr status writeback enable */
/* to set RX_DMA_EN */
#define SPIDER_NET_DMA_RX_VALUE 0x80000000
#define SPIDER_NET_DMA_RX_FEND_VALUE 0x00030003
/* to set TX_DMA_EN */
#define SPIDER_NET_DMA_TX_VALUE 0x80000000
#define SPIDER_NET_DMA_TX_FEND_VALUE 0x00030003
/* SPIDER_NET_UA_DESCR_VALUE is OR'ed with the unicast address */
#define SPIDER_NET_UA_DESCR_VALUE 0x00080000
#define SPIDER_NET_PROMISC_VALUE 0x00080000
#define SPIDER_NET_NONPROMISC_VALUE 0x00000000
#define SPIDER_NET_DMASEL_VALUE 0x00000001
#define SPIDER_NET_ECMODE_VALUE 0x00000000
#define SPIDER_NET_CKRCTRL_RUN_VALUE 0x1fff010f
#define SPIDER_NET_CKRCTRL_STOP_VALUE 0x0000010f
#define SPIDER_NET_SBIMSTATE_VALUE 0x00000000
#define SPIDER_NET_SBTMSTATE_VALUE 0x00000000
/* SPIDER_NET_GHIINT0STS bits, in reverse order so that they can be used
* with 1 << SPIDER_NET_... */
enum spider_net_int0_status {
SPIDER_NET_GPHYINT = 0,
SPIDER_NET_GMAC2INT,
SPIDER_NET_GMAC1INT,
SPIDER_NET_GIPSINT,
SPIDER_NET_GFIFOINT,
SPIDER_NET_GDMACINT,
SPIDER_NET_GSYSINT,
SPIDER_NET_GPWOPCMPINT,
SPIDER_NET_GPROPCMPINT,
SPIDER_NET_GPWFFINT,
SPIDER_NET_GRMDADRINT,
SPIDER_NET_GRMARPINT,
SPIDER_NET_GRMMPINT,
SPIDER_NET_GDTDEN0INT,
SPIDER_NET_GDDDEN0INT,
SPIDER_NET_GDCDEN0INT,
SPIDER_NET_GDBDEN0INT,
SPIDER_NET_GDADEN0INT,
SPIDER_NET_GDTFDCINT,
SPIDER_NET_GDDFDCINT,
SPIDER_NET_GDCFDCINT,
SPIDER_NET_GDBFDCINT,
SPIDER_NET_GDAFDCINT,
SPIDER_NET_GTTEDINT,
SPIDER_NET_GDTDCEINT,
SPIDER_NET_GRFDNMINT,
SPIDER_NET_GRFCNMINT,
SPIDER_NET_GRFBNMINT,
SPIDER_NET_GRFANMINT,
SPIDER_NET_GRFNMINT,
SPIDER_NET_G1TMCNTINT,
SPIDER_NET_GFREECNTINT
};
/* GHIINT1STS bits */
enum spider_net_int1_status {
SPIDER_NET_GTMFLLINT = 0,
SPIDER_NET_GRMFLLINT,
SPIDER_NET_GTMSHTINT,
SPIDER_NET_GDTINVDINT,
SPIDER_NET_GRFDFLLINT,
SPIDER_NET_GDDDCEINT,
SPIDER_NET_GDDINVDINT,
SPIDER_NET_GRFCFLLINT,
SPIDER_NET_GDCDCEINT,
SPIDER_NET_GDCINVDINT,
SPIDER_NET_GRFBFLLINT,
SPIDER_NET_GDBDCEINT,
SPIDER_NET_GDBINVDINT,
SPIDER_NET_GRFAFLLINT,
SPIDER_NET_GDADCEINT,
SPIDER_NET_GDAINVDINT,
SPIDER_NET_GDTRSERINT,
SPIDER_NET_GDDRSERINT,
SPIDER_NET_GDCRSERINT,
SPIDER_NET_GDBRSERINT,
SPIDER_NET_GDARSERINT,
SPIDER_NET_GDSERINT,
SPIDER_NET_GDTPTERINT,
SPIDER_NET_GDDPTERINT,
SPIDER_NET_GDCPTERINT,
SPIDER_NET_GDBPTERINT,
SPIDER_NET_GDAPTERINT
};
/* GHIINT2STS bits */
enum spider_net_int2_status {
SPIDER_NET_GPROPERINT = 0,
SPIDER_NET_GMCTCRSNGINT,
SPIDER_NET_GMCTLCOLINT,
SPIDER_NET_GMCTTMOTINT,
SPIDER_NET_GMCRCAERINT,
SPIDER_NET_GMCRCALERINT,
SPIDER_NET_GMCRALNERINT,
SPIDER_NET_GMCROVRINT,
SPIDER_NET_GMCRRNTINT,
SPIDER_NET_GMCRRXERINT,
SPIDER_NET_GTITCSERINT,
SPIDER_NET_GTIFMTERINT,
SPIDER_NET_GTIPKTRVKINT,
SPIDER_NET_GTISPINGINT,
SPIDER_NET_GTISADNGINT,
SPIDER_NET_GTISPDNGINT,
SPIDER_NET_GRIFMTERINT,
SPIDER_NET_GRIPKTRVKINT,
SPIDER_NET_GRISPINGINT,
SPIDER_NET_GRISADNGINT,
SPIDER_NET_GRISPDNGINT
};
#define SPIDER_NET_TXINT ( (1 << SPIDER_NET_GTTEDINT) | \
(1 << SPIDER_NET_GDTDCEINT) | \
(1 << SPIDER_NET_GDTFDCINT) )
/* we rely on flagged descriptor interrupts*/
#define SPIDER_NET_RXINT ( (1 << SPIDER_NET_GDAFDCINT) | \
(1 << SPIDER_NET_GRMFLLINT) )
#define SPIDER_NET_GPREXEC 0x80000000
#define SPIDER_NET_GPRDAT_MASK 0x0000ffff
/* descriptor bits
*
* 1010 descriptor ready
* 0 descr in middle of chain
* 000 fixed to 0
*
* 0 no interrupt on completion
* 000 fixed to 0
* 1 no ipsec processing
* 1 last descriptor for this frame
* 00 no checksum
* 10 tcp checksum
* 11 udp checksum
*
* 00 fixed to 0
* 0 fixed to 0
* 0 no interrupt on response errors
* 0 no interrupt on invalid descr
* 0 no interrupt on dma process termination
* 0 no interrupt on descr chain end
* 0 no interrupt on descr complete
*
* 000 fixed to 0
* 0 response error interrupt status
* 0 invalid descr status
* 0 dma termination status
* 0 descr chain end status
* 0 descr complete status */
#define SPIDER_NET_DMAC_CMDSTAT_NOCS 0xa00c0000
#define SPIDER_NET_DMAC_CMDSTAT_TCPCS 0xa00e0000
#define SPIDER_NET_DMAC_CMDSTAT_UDPCS 0xa00f0000
#define SPIDER_NET_DESCR_IND_PROC_SHIFT 28
#define SPIDER_NET_DESCR_IND_PROC_MASKO 0x0fffffff
/* descr ready, descr is in middle of chain, get interrupt on completion */
#define SPIDER_NET_DMAC_RX_CARDOWNED 0xa0800000
/* multicast is no problem */
#define SPIDER_NET_DATA_ERROR_MASK 0xffffbfff
enum spider_net_descr_status {
SPIDER_NET_DESCR_COMPLETE = 0x00, /* used in rx and tx */
SPIDER_NET_DESCR_RESPONSE_ERROR = 0x01, /* used in rx and tx */
SPIDER_NET_DESCR_PROTECTION_ERROR = 0x02, /* used in rx and tx */
SPIDER_NET_DESCR_FRAME_END = 0x04, /* used in rx */
SPIDER_NET_DESCR_FORCE_END = 0x05, /* used in rx and tx */
SPIDER_NET_DESCR_CARDOWNED = 0x0a, /* used in rx and tx */
SPIDER_NET_DESCR_NOT_IN_USE /* any other value */
};
struct spider_net_descr {
/* as defined by the hardware */
dma_addr_t buf_addr;
u32 buf_size;
dma_addr_t next_descr_addr;
u32 dmac_cmd_status;
u32 result_size;
u32 valid_size; /* all zeroes for tx */
u32 data_status;
u32 data_error; /* all zeroes for tx */
/* used in the driver */
struct sk_buff *skb;
dma_addr_t bus_addr;
struct spider_net_descr *next;
struct spider_net_descr *prev;
} __attribute__((aligned(32)));
struct spider_net_descr_chain {
/* we walk from tail to head */
struct spider_net_descr *head;
struct spider_net_descr *tail;
};
/* descriptor data_status bits */
#define SPIDER_NET_RXIPCHK 29
#define SPIDER_NET_TCPUDPIPCHK 28
#define SPIDER_NET_DATA_STATUS_CHK_MASK (1 << SPIDER_NET_RXIPCHK | \
1 << SPIDER_NET_TCPUDPIPCHK)
#define SPIDER_NET_VLAN_PACKET 21
/* descriptor data_error bits */
#define SPIDER_NET_RXIPCHKERR 27
#define SPIDER_NET_RXTCPCHKERR 26
#define SPIDER_NET_DATA_ERROR_CHK_MASK (1 << SPIDER_NET_RXIPCHKERR | \
1 << SPIDER_NET_RXTCPCHKERR)
/* the cases we don't pass the packet to the stack */
#define SPIDER_NET_DESTROY_RX_FLAGS 0x70138000
#define SPIDER_NET_DESCR_SIZE 32
/* this will be bigger some time */
struct spider_net_options {
int rx_csum; /* for rx: if 0 ip_summed=NONE,
if 1 and hw has verified, ip_summed=UNNECESSARY */
};
#define SPIDER_NET_DEFAULT_MSG ( NETIF_MSG_DRV | \
NETIF_MSG_PROBE | \
NETIF_MSG_LINK | \
NETIF_MSG_TIMER | \
NETIF_MSG_IFDOWN | \
NETIF_MSG_IFUP | \
NETIF_MSG_RX_ERR | \
NETIF_MSG_TX_ERR | \
NETIF_MSG_TX_QUEUED | \
NETIF_MSG_INTR | \
NETIF_MSG_TX_DONE | \
NETIF_MSG_RX_STATUS | \
NETIF_MSG_PKTDATA | \
NETIF_MSG_HW | \
NETIF_MSG_WOL )
struct spider_net_card {
struct net_device *netdev;
struct pci_dev *pdev;
struct mii_phy phy;
void __iomem *regs;
struct spider_net_descr_chain tx_chain;
struct spider_net_descr_chain rx_chain;
spinlock_t chain_lock;
struct net_device_stats netdev_stats;
struct spider_net_options options;
spinlock_t intmask_lock;
struct work_struct tx_timeout_task;
atomic_t tx_timeout_task_counter;
wait_queue_head_t waitq;
/* for ethtool */
int msg_enable;
struct spider_net_descr descr[0];
};
#define pr_err(fmt,arg...) \
printk(KERN_ERR fmt ,##arg)
#endif

126
drivers/net/spider_net_ethtool.c Normal file
View file

@ -0,0 +1,126 @@
/*
* Network device driver for Cell Processor-Based Blade
*
* (C) Copyright IBM Corp. 2005
*
* Authors : Utz Bacher <utz.bacher@de.ibm.com>
* Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
*
* 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
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <linux/netdevice.h>
#include <linux/ethtool.h>
#include <linux/pci.h>
#include "spider_net.h"
static int
spider_net_ethtool_get_settings(struct net_device *netdev,
struct ethtool_cmd *cmd)
{
struct spider_net_card *card;
card = netdev_priv(netdev);
cmd->supported = (SUPPORTED_1000baseT_Full |
SUPPORTED_FIBRE);
cmd->advertising = (ADVERTISED_1000baseT_Full |
ADVERTISED_FIBRE);
cmd->port = PORT_FIBRE;
cmd->speed = card->phy.speed;
cmd->duplex = DUPLEX_FULL;
return 0;
}
static void
spider_net_ethtool_get_drvinfo(struct net_device *netdev,
struct ethtool_drvinfo *drvinfo)
{
struct spider_net_card *card;
card = netdev_priv(netdev);
/* clear and fill out info */
memset(drvinfo, 0, sizeof(struct ethtool_drvinfo));
strncpy(drvinfo->driver, spider_net_driver_name, 32);
strncpy(drvinfo->version, "0.1", 32);
strcpy(drvinfo->fw_version, "no information");
strncpy(drvinfo->bus_info, pci_name(card->pdev), 32);
}
static void
spider_net_ethtool_get_wol(struct net_device *netdev,
struct ethtool_wolinfo *wolinfo)
{
/* no support for wol */
wolinfo->supported = 0;
wolinfo->wolopts = 0;
}
static u32
spider_net_ethtool_get_msglevel(struct net_device *netdev)
{
struct spider_net_card *card;
card = netdev_priv(netdev);
return card->msg_enable;
}
static void
spider_net_ethtool_set_msglevel(struct net_device *netdev,
u32 level)
{
struct spider_net_card *card;
card = netdev_priv(netdev);
card->msg_enable = level;
}
static int
spider_net_ethtool_nway_reset(struct net_device *netdev)
{
if (netif_running(netdev)) {
spider_net_stop(netdev);
spider_net_open(netdev);
}
return 0;
}
static u32
spider_net_ethtool_get_rx_csum(struct net_device *netdev)
{
struct spider_net_card *card = netdev->priv;
return card->options.rx_csum;
}
static int
spider_net_ethtool_set_rx_csum(struct net_device *netdev, u32 n)
{
struct spider_net_card *card = netdev->priv;
card->options.rx_csum = n;
return 0;
}
struct ethtool_ops spider_net_ethtool_ops = {
.get_settings = spider_net_ethtool_get_settings,
.get_drvinfo = spider_net_ethtool_get_drvinfo,
.get_wol = spider_net_ethtool_get_wol,
.get_msglevel = spider_net_ethtool_get_msglevel,
.set_msglevel = spider_net_ethtool_set_msglevel,
.nway_reset = spider_net_ethtool_nway_reset,
.get_rx_csum = spider_net_ethtool_get_rx_csum,
.set_rx_csum = spider_net_ethtool_set_rx_csum,
};

2
drivers/net/sun3lance.c
View file

@ -162,7 +162,7 @@ struct lance_private {
#define MEM lp->mem #define MEM lp->mem
#define DREG lp->iobase[0] #define DREG lp->iobase[0]
#define AREG lp->iobase[1] #define AREG lp->iobase[1]
#define REGA(a) ( AREG = (a), DREG ) #define REGA(a) (*( AREG = (a), &DREG ))
/* Definitions for the Lance */ /* Definitions for the Lance */

41
drivers/net/wireless/airo.c
View file

@ -3258,7 +3258,7 @@ badrx:
wstats.noise = apriv->wstats.qual.noise; wstats.noise = apriv->wstats.qual.noise;
wstats.updated = IW_QUAL_LEVEL_UPDATED wstats.updated = IW_QUAL_LEVEL_UPDATED
| IW_QUAL_QUAL_UPDATED | IW_QUAL_QUAL_UPDATED
| IW_QUAL_NOISE_UPDATED; | IW_QUAL_DBM;
/* Update spy records */ /* Update spy records */
wireless_spy_update(dev, sa, &wstats); wireless_spy_update(dev, sa, &wstats);
} }
@ -3604,7 +3604,7 @@ void mpi_receive_802_11 (struct airo_info *ai)
wstats.noise = ai->wstats.qual.noise; wstats.noise = ai->wstats.qual.noise;
wstats.updated = IW_QUAL_QUAL_UPDATED wstats.updated = IW_QUAL_QUAL_UPDATED
| IW_QUAL_LEVEL_UPDATED | IW_QUAL_LEVEL_UPDATED
| IW_QUAL_NOISE_UPDATED; | IW_QUAL_DBM;
/* Update spy records */ /* Update spy records */
wireless_spy_update(ai->dev, sa, &wstats); wireless_spy_update(ai->dev, sa, &wstats);
} }
@ -6489,22 +6489,20 @@ static int airo_get_range(struct net_device *dev,
range->max_qual.qual = 100; /* % */ range->max_qual.qual = 100; /* % */
else else
range->max_qual.qual = airo_get_max_quality(&cap_rid); range->max_qual.qual = airo_get_max_quality(&cap_rid);
range->max_qual.level = 0; /* 0 means we use dBm */ range->max_qual.level = 0x100 - 120; /* -120 dBm */
range->max_qual.noise = 0; range->max_qual.noise = 0x100 - 120; /* -120 dBm */
range->max_qual.updated = 0;
/* Experimental measurements - boundary 11/5.5 Mb/s */ /* Experimental measurements - boundary 11/5.5 Mb/s */
/* Note : with or without the (local->rssi), results /* Note : with or without the (local->rssi), results
* are somewhat different. - Jean II */ * are somewhat different. - Jean II */
if (local->rssi) { if (local->rssi) {
range->avg_qual.qual = 50; /* % */ range->avg_qual.qual = 50; /* % */
range->avg_qual.level = 186; /* -70 dBm */ range->avg_qual.level = 0x100 - 70; /* -70 dBm */
} else { } else {
range->avg_qual.qual = airo_get_avg_quality(&cap_rid); range->avg_qual.qual = airo_get_avg_quality(&cap_rid);
range->avg_qual.level = 176; /* -80 dBm */ range->avg_qual.level = 0x100 - 80; /* -80 dBm */
} }
range->avg_qual.noise = 0; range->avg_qual.noise = 0x100 - 85; /* -85 dBm */
range->avg_qual.updated = 0;
for(i = 0 ; i < 8 ; i++) { for(i = 0 ; i < 8 ; i++) {
range->bitrate[i] = cap_rid.supportedRates[i] * 500000; range->bitrate[i] = cap_rid.supportedRates[i] * 500000;
@ -6727,15 +6725,17 @@ static int airo_get_aplist(struct net_device *dev,
if (local->rssi) { if (local->rssi) {
qual[i].level = 0x100 - BSSList.dBm; qual[i].level = 0x100 - BSSList.dBm;
qual[i].qual = airo_dbm_to_pct( local->rssi, BSSList.dBm ); qual[i].qual = airo_dbm_to_pct( local->rssi, BSSList.dBm );
qual[i].updated = IW_QUAL_QUAL_UPDATED; qual[i].updated = IW_QUAL_QUAL_UPDATED
| IW_QUAL_LEVEL_UPDATED
| IW_QUAL_DBM;
} else { } else {
qual[i].level = (BSSList.dBm + 321) / 2; qual[i].level = (BSSList.dBm + 321) / 2;
qual[i].qual = 0; qual[i].qual = 0;
qual[i].updated = IW_QUAL_QUAL_INVALID; qual[i].updated = IW_QUAL_QUAL_INVALID
| IW_QUAL_LEVEL_UPDATED
| IW_QUAL_DBM;
} }
qual[i].noise = local->wstats.qual.noise; qual[i].noise = local->wstats.qual.noise;
qual[i].updated = IW_QUAL_LEVEL_UPDATED
| IW_QUAL_NOISE_UPDATED;
if (BSSList.index == 0xffff) if (BSSList.index == 0xffff)
break; break;
} }
@ -6861,15 +6861,17 @@ static inline char *airo_translate_scan(struct net_device *dev,
if (ai->rssi) { if (ai->rssi) {
iwe.u.qual.level = 0x100 - bss->dBm; iwe.u.qual.level = 0x100 - bss->dBm;
iwe.u.qual.qual = airo_dbm_to_pct( ai->rssi, bss->dBm ); iwe.u.qual.qual = airo_dbm_to_pct( ai->rssi, bss->dBm );
iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED; iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED
| IW_QUAL_LEVEL_UPDATED
| IW_QUAL_DBM;
} else { } else {
iwe.u.qual.level = (bss->dBm + 321) / 2; iwe.u.qual.level = (bss->dBm + 321) / 2;
iwe.u.qual.qual = 0; iwe.u.qual.qual = 0;
iwe.u.qual.updated = IW_QUAL_QUAL_INVALID; iwe.u.qual.updated = IW_QUAL_QUAL_INVALID
| IW_QUAL_LEVEL_UPDATED
| IW_QUAL_DBM;
} }
iwe.u.qual.noise = ai->wstats.qual.noise; iwe.u.qual.noise = ai->wstats.qual.noise;
iwe.u.qual.updated = IW_QUAL_LEVEL_UPDATED
| IW_QUAL_NOISE_UPDATED;
current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN); current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
/* Add encryption capability */ /* Add encryption capability */
@ -7222,13 +7224,12 @@ static void airo_read_wireless_stats(struct airo_info *local)
local->wstats.qual.level = (status_rid.normalizedSignalStrength + 321) / 2; local->wstats.qual.level = (status_rid.normalizedSignalStrength + 321) / 2;
local->wstats.qual.qual = airo_get_quality(&status_rid, &cap_rid); local->wstats.qual.qual = airo_get_quality(&status_rid, &cap_rid);
} }
local->wstats.qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED;
if (status_rid.len >= 124) { if (status_rid.len >= 124) {
local->wstats.qual.noise = 0x100 - status_rid.noisedBm; local->wstats.qual.noise = 0x100 - status_rid.noisedBm;
local->wstats.qual.updated |= IW_QUAL_NOISE_UPDATED; local->wstats.qual.updated = IW_QUAL_ALL_UPDATED | IW_QUAL_DBM;
} else { } else {
local->wstats.qual.noise = 0; local->wstats.qual.noise = 0;
local->wstats.qual.updated |= IW_QUAL_NOISE_INVALID; local->wstats.qual.updated = IW_QUAL_QUAL_UPDATED | IW_QUAL_LEVEL_UPDATED | IW_QUAL_NOISE_INVALID | IW_QUAL_DBM;
} }
/* Packets discarded in the wireless adapter due to wireless /* Packets discarded in the wireless adapter due to wireless

17
drivers/net/wireless/atmel.c
View file

@ -1593,7 +1593,6 @@ struct net_device *init_atmel_card( unsigned short irq, int port, const AtmelFWT
dev->set_mac_address = atmel_set_mac_address; dev->set_mac_address = atmel_set_mac_address;
dev->hard_start_xmit = start_tx; dev->hard_start_xmit = start_tx;
dev->get_stats = atmel_get_stats; dev->get_stats = atmel_get_stats;
dev->get_wireless_stats = atmel_get_wireless_stats;
dev->wireless_handlers = (struct iw_handler_def *)&atmel_handler_def; dev->wireless_handlers = (struct iw_handler_def *)&atmel_handler_def;
dev->do_ioctl = atmel_ioctl; dev->do_ioctl = atmel_ioctl;
dev->irq = irq; dev->irq = irq;
@ -2411,7 +2410,8 @@ static const struct iw_handler_def atmel_handler_def =
.num_private_args = sizeof(atmel_private_args)/sizeof(struct iw_priv_args), .num_private_args = sizeof(atmel_private_args)/sizeof(struct iw_priv_args),
.standard = (iw_handler *) atmel_handler, .standard = (iw_handler *) atmel_handler,
.private = (iw_handler *) atmel_private_handler, .private = (iw_handler *) atmel_private_handler,
.private_args = (struct iw_priv_args *) atmel_private_args .private_args = (struct iw_priv_args *) atmel_private_args,
.get_wireless_stats = atmel_get_wireless_stats
}; };
static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
@ -2424,19 +2424,6 @@ static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
char domain[REGDOMAINSZ+1]; char domain[REGDOMAINSZ+1];
switch (cmd) { switch (cmd) {
case SIOCGIWPRIV:
if(wrq->u.data.pointer) {
/* Set the number of ioctl available */
wrq->u.data.length = sizeof(atmel_private_args) / sizeof(atmel_private_args[0]);
/* Copy structure to the user buffer */
if (copy_to_user(wrq->u.data.pointer,
(u_char *) atmel_private_args,
sizeof(atmel_private_args)))
rc = -EFAULT;
}
break;
case ATMELIDIFC: case ATMELIDIFC:
wrq->u.param.value = ATMELMAGIC; wrq->u.param.value = ATMELMAGIC;
break; break;

808
drivers/net/wireless/ipw2200.c
View file

File diff suppressed because it is too large Load diff

148
drivers/net/wireless/ipw2200.h
View file

@ -56,8 +56,7 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
/* Authentication and Association States */ /* Authentication and Association States */
enum connection_manager_assoc_states enum connection_manager_assoc_states {
{
CMAS_INIT = 0, CMAS_INIT = 0,
CMAS_TX_AUTH_SEQ_1, CMAS_TX_AUTH_SEQ_1,
CMAS_RX_AUTH_SEQ_2, CMAS_RX_AUTH_SEQ_2,
@ -74,7 +73,6 @@ enum connection_manager_assoc_states
CMAS_LAST CMAS_LAST
}; };
#define IPW_WAIT (1<<0) #define IPW_WAIT (1<<0)
#define IPW_QUIET (1<<1) #define IPW_QUIET (1<<1)
#define IPW_ROAMING (1<<2) #define IPW_ROAMING (1<<2)
@ -190,7 +188,6 @@ enum connection_manager_assoc_states
#define DCT_FLAG_EXT_MODE_CCK 0x01 #define DCT_FLAG_EXT_MODE_CCK 0x01
#define DCT_FLAG_EXT_MODE_OFDM 0x00 #define DCT_FLAG_EXT_MODE_OFDM 0x00
#define TX_RX_TYPE_MASK 0xFF #define TX_RX_TYPE_MASK 0xFF
#define TX_FRAME_TYPE 0x00 #define TX_FRAME_TYPE 0x00
#define TX_HOST_COMMAND_TYPE 0x01 #define TX_HOST_COMMAND_TYPE 0x01
@ -252,8 +249,7 @@ struct clx2_queue {
int high_mark; /**< high watermark, stop queue if free space less than this */ int high_mark; /**< high watermark, stop queue if free space less than this */
} __attribute__ ((packed)); } __attribute__ ((packed));
struct machdr32 struct machdr32 {
{
u16 frame_ctl; u16 frame_ctl;
u16 duration; // watch out for endians! u16 duration; // watch out for endians!
u8 addr1[MACADRR_BYTE_LEN]; u8 addr1[MACADRR_BYTE_LEN];
@ -264,8 +260,7 @@ struct machdr32
u16 qos_ctrl; u16 qos_ctrl;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct machdr30 struct machdr30 {
{
u16 frame_ctl; u16 frame_ctl;
u16 duration; // watch out for endians! u16 duration; // watch out for endians!
u8 addr1[MACADRR_BYTE_LEN]; u8 addr1[MACADRR_BYTE_LEN];
@ -275,8 +270,7 @@ struct machdr30
u8 addr4[MACADRR_BYTE_LEN]; u8 addr4[MACADRR_BYTE_LEN];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct machdr26 struct machdr26 {
{
u16 frame_ctl; u16 frame_ctl;
u16 duration; // watch out for endians! u16 duration; // watch out for endians!
u8 addr1[MACADRR_BYTE_LEN]; u8 addr1[MACADRR_BYTE_LEN];
@ -286,8 +280,7 @@ struct machdr26
u16 qos_ctrl; u16 qos_ctrl;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct machdr24 struct machdr24 {
{
u16 frame_ctl; u16 frame_ctl;
u16 duration; // watch out for endians! u16 duration; // watch out for endians!
u8 addr1[MACADRR_BYTE_LEN]; u8 addr1[MACADRR_BYTE_LEN];
@ -297,23 +290,20 @@ struct machdr24
} __attribute__ ((packed)); } __attribute__ ((packed));
// TX TFD with 32 byte MAC Header // TX TFD with 32 byte MAC Header
struct tx_tfd_32 struct tx_tfd_32 {
{
struct machdr32 mchdr; // 32 struct machdr32 mchdr; // 32
u32 uivplaceholder[2]; // 8 u32 uivplaceholder[2]; // 8
} __attribute__ ((packed)); } __attribute__ ((packed));
// TX TFD with 30 byte MAC Header // TX TFD with 30 byte MAC Header
struct tx_tfd_30 struct tx_tfd_30 {
{
struct machdr30 mchdr; // 30 struct machdr30 mchdr; // 30
u8 reserved[2]; // 2 u8 reserved[2]; // 2
u32 uivplaceholder[2]; // 8 u32 uivplaceholder[2]; // 8
} __attribute__ ((packed)); } __attribute__ ((packed));
// tx tfd with 26 byte mac header // tx tfd with 26 byte mac header
struct tx_tfd_26 struct tx_tfd_26 {
{
struct machdr26 mchdr; // 26 struct machdr26 mchdr; // 26
u8 reserved1[2]; // 2 u8 reserved1[2]; // 2
u32 uivplaceholder[2]; // 8 u32 uivplaceholder[2]; // 8
@ -321,18 +311,15 @@ struct tx_tfd_26
} __attribute__ ((packed)); } __attribute__ ((packed));
// tx tfd with 24 byte mac header // tx tfd with 24 byte mac header
struct tx_tfd_24 struct tx_tfd_24 {
{
struct machdr24 mchdr; // 24 struct machdr24 mchdr; // 24
u32 uivplaceholder[2]; // 8 u32 uivplaceholder[2]; // 8
u8 reserved[8]; // 8 u8 reserved[8]; // 8
} __attribute__ ((packed)); } __attribute__ ((packed));
#define DCT_WEP_KEY_FIELD_LENGTH 16 #define DCT_WEP_KEY_FIELD_LENGTH 16
struct tfd_command struct tfd_command {
{
u8 index; u8 index;
u8 length; u8 length;
u16 reserved; u16 reserved;
@ -365,8 +352,7 @@ struct tfd_data {
u8 reserved3; u8 reserved3;
/* 802.11 MAC Header */ /* 802.11 MAC Header */
union union {
{
struct tx_tfd_24 tfd_24; struct tx_tfd_24 tfd_24;
struct tx_tfd_26 tfd_26; struct tx_tfd_26 tfd_26;
struct tx_tfd_30 tfd_30; struct tx_tfd_30 tfd_30;
@ -379,8 +365,7 @@ struct tfd_data {
u16 chunk_len[NUM_TFD_CHUNKS]; u16 chunk_len[NUM_TFD_CHUNKS];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct txrx_control_flags struct txrx_control_flags {
{
u8 message_type; u8 message_type;
u8 rx_seq_num; u8 rx_seq_num;
u8 control_bits; u8 control_bits;
@ -390,8 +375,7 @@ struct txrx_control_flags
#define TFD_SIZE 128 #define TFD_SIZE 128
#define TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH (TFD_SIZE - sizeof(struct txrx_control_flags)) #define TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH (TFD_SIZE - sizeof(struct txrx_control_flags))
struct tfd_frame struct tfd_frame {
{
struct txrx_control_flags control_flags; struct txrx_control_flags control_flags;
union { union {
struct tfd_data data; struct tfd_data data;
@ -423,8 +407,7 @@ struct clx2_tx_queue {
#define SUP_RATE_11G_MAX_NUM_CHANNELS (12) #define SUP_RATE_11G_MAX_NUM_CHANNELS (12)
// Used for passing to driver number of successes and failures per rate // Used for passing to driver number of successes and failures per rate
struct rate_histogram struct rate_histogram {
{
union { union {
u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS]; u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS];
u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS]; u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
@ -571,8 +554,7 @@ struct ipw_rx_header {
u8 reserved; u8 reserved;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_rx_packet struct ipw_rx_packet {
{
struct ipw_rx_header header; struct ipw_rx_header header;
union { union {
struct ipw_rx_frame frame; struct ipw_rx_frame frame;
@ -604,7 +586,6 @@ struct ipw_rx_queue {
spinlock_t lock; spinlock_t lock;
}; /* Not transferred over network, so not __attribute__ ((packed)) */ }; /* Not transferred over network, so not __attribute__ ((packed)) */
struct alive_command_responce { struct alive_command_responce {
u8 alive_command; u8 alive_command;
u8 sequence_number; u8 sequence_number;
@ -627,8 +608,7 @@ struct ipw_rates {
u8 rates[IPW_MAX_RATES]; u8 rates[IPW_MAX_RATES];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct command_block struct command_block {
{
unsigned int control; unsigned int control;
u32 source_addr; u32 source_addr;
u32 dest_addr; u32 dest_addr;
@ -636,8 +616,7 @@ struct command_block
} __attribute__ ((packed)); } __attribute__ ((packed));
#define CB_NUMBER_OF_ELEMENTS_SMALL 64 #define CB_NUMBER_OF_ELEMENTS_SMALL 64
struct fw_image_desc struct fw_image_desc {
{
unsigned long last_cb_index; unsigned long last_cb_index;
unsigned long current_cb_index; unsigned long current_cb_index;
struct command_block cb_list[CB_NUMBER_OF_ELEMENTS_SMALL]; struct command_block cb_list[CB_NUMBER_OF_ELEMENTS_SMALL];
@ -646,8 +625,7 @@ struct fw_image_desc
unsigned long len; unsigned long len;
}; };
struct ipw_sys_config struct ipw_sys_config {
{
u8 bt_coexistence; u8 bt_coexistence;
u8 reserved1; u8 reserved1;
u8 answer_broadcast_ssid_probe; u8 answer_broadcast_ssid_probe;
@ -670,8 +648,7 @@ struct ipw_sys_config
u8 reserved3; u8 reserved3;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_multicast_addr struct ipw_multicast_addr {
{
u8 num_of_multicast_addresses; u8 num_of_multicast_addresses;
u8 reserved[3]; u8 reserved[3];
u8 mac1[6]; u8 mac1[6];
@ -680,8 +657,7 @@ struct ipw_multicast_addr
u8 mac4[6]; u8 mac4[6];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_wep_key struct ipw_wep_key {
{
u8 cmd_id; u8 cmd_id;
u8 seq_num; u8 seq_num;
u8 key_index; u8 key_index;
@ -689,8 +665,7 @@ struct ipw_wep_key
u8 key[16]; u8 key[16];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_tgi_tx_key struct ipw_tgi_tx_key {
{
u8 key_id; u8 key_id;
u8 security_type; u8 security_type;
u8 station_index; u8 station_index;
@ -701,8 +676,7 @@ struct ipw_tgi_tx_key
#define IPW_SCAN_CHANNELS 54 #define IPW_SCAN_CHANNELS 54
struct ipw_scan_request struct ipw_scan_request {
{
u8 scan_type; u8 scan_type;
u16 dwell_time; u16 dwell_time;
u8 channels_list[IPW_SCAN_CHANNELS]; u8 channels_list[IPW_SCAN_CHANNELS];
@ -718,8 +692,7 @@ enum {
IPW_SCAN_TYPES IPW_SCAN_TYPES
}; };
struct ipw_scan_request_ext struct ipw_scan_request_ext {
{
u32 full_scan_index; u32 full_scan_index;
u8 channels_list[IPW_SCAN_CHANNELS]; u8 channels_list[IPW_SCAN_CHANNELS];
u8 scan_type[IPW_SCAN_CHANNELS / 2]; u8 scan_type[IPW_SCAN_CHANNELS / 2];
@ -740,19 +713,16 @@ extern inline void ipw_set_scan_type(struct ipw_scan_request_ext *scan,
{ {
if (index % 2) if (index % 2)
scan->scan_type[index / 2] = scan->scan_type[index / 2] =
(scan->scan_type[index / 2] & 0xF0) | (scan->scan_type[index / 2] & 0xF0) | (scan_type & 0x0F);
(scan_type & 0x0F);
else else
scan->scan_type[index / 2] = scan->scan_type[index / 2] =
(scan->scan_type[index / 2] & 0x0F) | (scan->scan_type[index / 2] & 0x0F) |
((scan_type & 0x0F) << 4); ((scan_type & 0x0F) << 4);
} }
struct ipw_associate struct ipw_associate {
{
u8 channel; u8 channel;
u8 auth_type:4, u8 auth_type:4, auth_key:4;
auth_key:4;
u8 assoc_type; u8 assoc_type;
u8 reserved; u8 reserved;
u16 policy_support; u16 policy_support;
@ -771,8 +741,7 @@ struct ipw_associate
u16 reserved2; u16 reserved2;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_supported_rates struct ipw_supported_rates {
{
u8 ieee_mode; u8 ieee_mode;
u8 num_rates; u8 num_rates;
u8 purpose; u8 purpose;
@ -780,42 +749,36 @@ struct ipw_supported_rates
u8 supported_rates[IPW_MAX_RATES]; u8 supported_rates[IPW_MAX_RATES];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_rts_threshold struct ipw_rts_threshold {
{
u16 rts_threshold; u16 rts_threshold;
u16 reserved; u16 reserved;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_frag_threshold struct ipw_frag_threshold {
{
u16 frag_threshold; u16 frag_threshold;
u16 reserved; u16 reserved;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_retry_limit struct ipw_retry_limit {
{
u8 short_retry_limit; u8 short_retry_limit;
u8 long_retry_limit; u8 long_retry_limit;
u16 reserved; u16 reserved;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_dino_config struct ipw_dino_config {
{
u32 dino_config_addr; u32 dino_config_addr;
u16 dino_config_size; u16 dino_config_size;
u8 dino_response; u8 dino_response;
u8 reserved; u8 reserved;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_aironet_info struct ipw_aironet_info {
{
u8 id; u8 id;
u8 length; u8 length;
u16 reserved; u16 reserved;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_rx_key struct ipw_rx_key {
{
u8 station_index; u8 station_index;
u8 key_type; u8 key_type;
u8 key_id; u8 key_id;
@ -826,23 +789,20 @@ struct ipw_rx_key
u8 reserved; u8 reserved;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_country_channel_info struct ipw_country_channel_info {
{
u8 first_channel; u8 first_channel;
u8 no_channels; u8 no_channels;
s8 max_tx_power; s8 max_tx_power;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_country_info struct ipw_country_info {
{
u8 id; u8 id;
u8 length; u8 length;
u8 country_str[3]; u8 country_str[3];
struct ipw_country_channel_info groups[7]; struct ipw_country_channel_info groups[7];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_channel_tx_power struct ipw_channel_tx_power {
{
u8 channel_number; u8 channel_number;
s8 tx_power; s8 tx_power;
} __attribute__ ((packed)); } __attribute__ ((packed));
@ -852,15 +812,13 @@ struct ipw_channel_tx_power
#define MAX_A_CHANNELS 37 #define MAX_A_CHANNELS 37
#define MAX_B_CHANNELS 14 #define MAX_B_CHANNELS 14
struct ipw_tx_power struct ipw_tx_power {
{
u8 num_channels; u8 num_channels;
u8 ieee_mode; u8 ieee_mode;
struct ipw_channel_tx_power channels_tx_power[MAX_A_CHANNELS]; struct ipw_channel_tx_power channels_tx_power[MAX_A_CHANNELS];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_qos_parameters struct ipw_qos_parameters {
{
u16 cw_min[4]; u16 cw_min[4];
u16 cw_max[4]; u16 cw_max[4];
u8 aifs[4]; u8 aifs[4];
@ -868,15 +826,13 @@ struct ipw_qos_parameters
u16 tx_op_limit[4]; u16 tx_op_limit[4];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_rsn_capabilities struct ipw_rsn_capabilities {
{
u8 id; u8 id;
u8 length; u8 length;
u16 version; u16 version;
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ipw_sensitivity_calib struct ipw_sensitivity_calib {
{
u16 beacon_rssi_raw; u16 beacon_rssi_raw;
u16 reserved; u16 reserved;
} __attribute__ ((packed)); } __attribute__ ((packed));
@ -897,7 +853,8 @@ struct ipw_sensitivity_calib
struct ipw_cmd { struct ipw_cmd {
u32 cmd; /**< Host command */ u32 cmd; /**< Host command */
u32 status;/**< Status */ u32 status;/**< Status */
u32 status_len; /**< How many 32 bit parameters in the status */ u32 status_len;
/**< How many 32 bit parameters in the status */
u32 len; /**< incoming parameters length, bytes */ u32 len; /**< incoming parameters length, bytes */
/** /**
* command parameters. * command parameters.
@ -1091,7 +1048,6 @@ struct ipw_priv {
struct tasklet_struct irq_tasklet; struct tasklet_struct irq_tasklet;
#define IPW_2200BG 1 #define IPW_2200BG 1
#define IPW_2915ABG 2 #define IPW_2915ABG 2
u8 adapter; u8 adapter;
@ -1114,7 +1070,6 @@ struct ipw_priv {
u32 indirect_byte; u32 indirect_byte;
}; /*ipw_priv */ }; /*ipw_priv */
/* debug macros */ /* debug macros */
#ifdef CONFIG_IPW_DEBUG #ifdef CONFIG_IPW_DEBUG
@ -1170,7 +1125,6 @@ do { if (ipw_debug_level & (level)) \
#define IPW_DL_RF_KILL (1<<17) #define IPW_DL_RF_KILL (1<<17)
#define IPW_DL_FW_ERRORS (1<<18) #define IPW_DL_FW_ERRORS (1<<18)
#define IPW_DL_ORD (1<<20) #define IPW_DL_ORD (1<<20)
#define IPW_DL_FRAG (1<<21) #define IPW_DL_FRAG (1<<21)
@ -1184,7 +1138,6 @@ do { if (ipw_debug_level & (level)) \
#define IPW_DL_STATS (1<<29) #define IPW_DL_STATS (1<<29)
#define IPW_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a) #define IPW_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
#define IPW_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a) #define IPW_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a)
#define IPW_DEBUG_INFO(f, a...) IPW_DEBUG(IPW_DL_INFO, f, ## a) #define IPW_DEBUG_INFO(f, a...) IPW_DEBUG(IPW_DL_INFO, f, ## a)
@ -1289,14 +1242,12 @@ do { if (ipw_debug_level & (level)) \
#define CB_SRC_SIZE_LONG 0x00200000 #define CB_SRC_SIZE_LONG 0x00200000
#define CB_DEST_SIZE_LONG 0x00020000 #define CB_DEST_SIZE_LONG 0x00020000
/* DMA DEFINES */ /* DMA DEFINES */
#define DMA_CONTROL_SMALL_CB_CONST_VALUE 0x00540000 #define DMA_CONTROL_SMALL_CB_CONST_VALUE 0x00540000
#define DMA_CB_STOP_AND_ABORT 0x00000C00 #define DMA_CB_STOP_AND_ABORT 0x00000C00
#define DMA_CB_START 0x00000100 #define DMA_CB_START 0x00000100
#define CX2_SHARED_SRAM_SIZE 0x00030000 #define CX2_SHARED_SRAM_SIZE 0x00030000
#define CX2_SHARED_SRAM_DMA_CONTROL 0x00027000 #define CX2_SHARED_SRAM_DMA_CONTROL 0x00027000
#define CB_MAX_LENGTH 0x1FFF #define CB_MAX_LENGTH 0x1FFF
@ -1304,7 +1255,6 @@ do { if (ipw_debug_level & (level)) \
#define CX2_HOST_EEPROM_DATA_SRAM_SIZE 0xA18 #define CX2_HOST_EEPROM_DATA_SRAM_SIZE 0xA18
#define CX2_EEPROM_IMAGE_SIZE 0x100 #define CX2_EEPROM_IMAGE_SIZE 0x100
/* DMA defs */ /* DMA defs */
#define CX2_DMA_I_CURRENT_CB 0x003000D0 #define CX2_DMA_I_CURRENT_CB 0x003000D0
#define CX2_DMA_O_CURRENT_CB 0x003000D4 #define CX2_DMA_O_CURRENT_CB 0x003000D4
@ -1356,7 +1306,6 @@ do { if (ipw_debug_level & (level)) \
#define IPW_WHO_IS_AWAKE (CX2_SHARED_LOWER_BOUND + 0xB14) #define IPW_WHO_IS_AWAKE (CX2_SHARED_LOWER_BOUND + 0xB14)
#define IPW_DURING_ATIM_WINDOW (CX2_SHARED_LOWER_BOUND + 0xB18) #define IPW_DURING_ATIM_WINDOW (CX2_SHARED_LOWER_BOUND + 0xB18)
#define MSB 1 #define MSB 1
#define LSB 0 #define LSB 0
#define WORD_TO_BYTE(_word) ((_word) * sizeof(u16)) #define WORD_TO_BYTE(_word) ((_word) * sizeof(u16))
@ -1479,7 +1428,6 @@ enum {
#define IPW_RATE_CAPABILITIES 1 #define IPW_RATE_CAPABILITIES 1
#define IPW_RATE_CONNECT 0 #define IPW_RATE_CONNECT 0
/* /*
* Rate values and masks * Rate values and masks
*/ */
@ -1524,12 +1472,6 @@ enum {
IPW_ORD_STAT_TX_DIR_DATA_B_11, IPW_ORD_STAT_TX_DIR_DATA_B_11,
/* Hole */ /* Hole */
IPW_ORD_STAT_TX_DIR_DATA_G_1 = IPW_ORD_TABLE_0_MASK + 19, IPW_ORD_STAT_TX_DIR_DATA_G_1 = IPW_ORD_TABLE_0_MASK + 19,
IPW_ORD_STAT_TX_DIR_DATA_G_2, IPW_ORD_STAT_TX_DIR_DATA_G_2,
IPW_ORD_STAT_TX_DIR_DATA_G_5_5, IPW_ORD_STAT_TX_DIR_DATA_G_5_5,
@ -1549,12 +1491,6 @@ enum {
IPW_ORD_STAT_TX_NON_DIR_DATA_B_11, IPW_ORD_STAT_TX_NON_DIR_DATA_B_11,
/* Hole */ /* Hole */
IPW_ORD_STAT_TX_NON_DIR_DATA_G_1 = IPW_ORD_TABLE_0_MASK + 44, IPW_ORD_STAT_TX_NON_DIR_DATA_G_1 = IPW_ORD_TABLE_0_MASK + 44,
IPW_ORD_STAT_TX_NON_DIR_DATA_G_2, IPW_ORD_STAT_TX_NON_DIR_DATA_G_2,
IPW_ORD_STAT_TX_NON_DIR_DATA_G_5_5, IPW_ORD_STAT_TX_NON_DIR_DATA_G_5_5,

7
drivers/net/wireless/netwave_cs.c
View file

@ -471,12 +471,12 @@ static dev_link_t *netwave_attach(void)
dev->get_stats = &netwave_get_stats; dev->get_stats = &netwave_get_stats;
dev->set_multicast_list = &set_multicast_list; dev->set_multicast_list = &set_multicast_list;
/* wireless extensions */ /* wireless extensions */
#ifdef WIRELESS_EXT #if WIRELESS_EXT <= 16
dev->get_wireless_stats = &netwave_get_wireless_stats; dev->get_wireless_stats = &netwave_get_wireless_stats;
#endif /* WIRELESS_EXT <= 16 */
#if WIRELESS_EXT > 12 #if WIRELESS_EXT > 12
dev->wireless_handlers = (struct iw_handler_def *)&netwave_handler_def; dev->wireless_handlers = (struct iw_handler_def *)&netwave_handler_def;
#endif /* WIRELESS_EXT > 12 */ #endif /* WIRELESS_EXT > 12 */
#endif /* WIRELESS_EXT */
dev->do_ioctl = &netwave_ioctl; dev->do_ioctl = &netwave_ioctl;
dev->tx_timeout = &netwave_watchdog; dev->tx_timeout = &netwave_watchdog;
@ -839,6 +839,9 @@ static const struct iw_handler_def netwave_handler_def =
.standard = (iw_handler *) netwave_handler, .standard = (iw_handler *) netwave_handler,
.private = (iw_handler *) netwave_private_handler, .private = (iw_handler *) netwave_private_handler,
.private_args = (struct iw_priv_args *) netwave_private_args, .private_args = (struct iw_priv_args *) netwave_private_args,
#if WIRELESS_EXT > 16
.get_wireless_stats = netwave_get_wireless_stats,
#endif /* WIRELESS_EXT > 16 */
}; };
#endif /* WIRELESS_EXT > 12 */ #endif /* WIRELESS_EXT > 12 */

3
drivers/net/wireless/prism54/isl_ioctl.c
View file

@ -2727,6 +2727,9 @@ const struct iw_handler_def prism54_handler_def = {
.standard = (iw_handler *) prism54_handler, .standard = (iw_handler *) prism54_handler,
.private = (iw_handler *) prism54_private_handler, .private = (iw_handler *) prism54_private_handler,
.private_args = (struct iw_priv_args *) prism54_private_args, .private_args = (struct iw_priv_args *) prism54_private_args,
#if WIRELESS_EXT > 16
.get_wireless_stats = prism54_get_wireless_stats,
#endif /* WIRELESS_EXT > 16 */
#if WIRELESS_EXT == 16 #if WIRELESS_EXT == 16
.spy_offset = offsetof(islpci_private, spy_data), .spy_offset = offsetof(islpci_private, spy_data),
#endif /* WIRELESS_EXT == 16 */ #endif /* WIRELESS_EXT == 16 */

3
drivers/net/wireless/prism54/islpci_dev.c
View file

@ -815,7 +815,6 @@ islpci_setup(struct pci_dev *pdev)
ndev->open = &islpci_open; ndev->open = &islpci_open;
ndev->stop = &islpci_close; ndev->stop = &islpci_close;
ndev->get_stats = &islpci_statistics; ndev->get_stats = &islpci_statistics;
ndev->get_wireless_stats = &prism54_get_wireless_stats;
ndev->do_ioctl = &prism54_ioctl; ndev->do_ioctl = &prism54_ioctl;
ndev->wireless_handlers = ndev->wireless_handlers =
(struct iw_handler_def *) &prism54_handler_def; (struct iw_handler_def *) &prism54_handler_def;
@ -844,6 +843,8 @@ islpci_setup(struct pci_dev *pdev)
/* Add pointers to enable iwspy support. */ /* Add pointers to enable iwspy support. */
priv->wireless_data.spy_data = &priv->spy_data; priv->wireless_data.spy_data = &priv->spy_data;
ndev->wireless_data = &priv->wireless_data; ndev->wireless_data = &priv->wireless_data;
#else /* WIRELESS_EXT > 16 */
ndev->get_wireless_stats = &prism54_get_wireless_stats;
#endif /* WIRELESS_EXT > 16 */ #endif /* WIRELESS_EXT > 16 */
/* save the start and end address of the PCI memory area */ /* save the start and end address of the PCI memory area */

772
drivers/net/wireless/ray_cs.c
View file

@ -53,6 +53,7 @@
#include <pcmcia/ds.h> #include <pcmcia/ds.h>
#include <pcmcia/mem_op.h> #include <pcmcia/mem_op.h>
#include <net/ieee80211.h>
#include <linux/wireless.h> #include <linux/wireless.h>
#include <asm/io.h> #include <asm/io.h>
@ -64,7 +65,6 @@
#define WIRELESS_SPY /* Enable spying addresses */ #define WIRELESS_SPY /* Enable spying addresses */
/* Definitions we need for spy */ /* Definitions we need for spy */
typedef struct iw_statistics iw_stats; typedef struct iw_statistics iw_stats;
typedef struct iw_quality iw_qual;
typedef u_char mac_addr[ETH_ALEN]; /* Hardware address */ typedef u_char mac_addr[ETH_ALEN]; /* Hardware address */
#include "rayctl.h" #include "rayctl.h"
@ -101,7 +101,6 @@ static int ray_dev_close(struct net_device *dev);
static int ray_dev_config(struct net_device *dev, struct ifmap *map); static int ray_dev_config(struct net_device *dev, struct ifmap *map);
static struct net_device_stats *ray_get_stats(struct net_device *dev); static struct net_device_stats *ray_get_stats(struct net_device *dev);
static int ray_dev_init(struct net_device *dev); static int ray_dev_init(struct net_device *dev);
static int ray_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
static struct ethtool_ops netdev_ethtool_ops; static struct ethtool_ops netdev_ethtool_ops;
@ -114,9 +113,8 @@ static int translate_frame(ray_dev_t *local, struct tx_msg __iomem *ptx,
static void ray_build_header(ray_dev_t *local, struct tx_msg __iomem *ptx, UCHAR msg_type, static void ray_build_header(ray_dev_t *local, struct tx_msg __iomem *ptx, UCHAR msg_type,
unsigned char *data); unsigned char *data);
static void untranslate(ray_dev_t *local, struct sk_buff *skb, int len); static void untranslate(ray_dev_t *local, struct sk_buff *skb, int len);
#if WIRELESS_EXT > 7 /* If wireless extension exist in the kernel */
static iw_stats * ray_get_wireless_stats(struct net_device * dev); static iw_stats * ray_get_wireless_stats(struct net_device * dev);
#endif /* WIRELESS_EXT > 7 */ static const struct iw_handler_def ray_handler_def;
/***** Prototypes for raylink functions **************************************/ /***** Prototypes for raylink functions **************************************/
static int asc_to_int(char a); static int asc_to_int(char a);
@ -373,11 +371,12 @@ static dev_link_t *ray_attach(void)
dev->hard_start_xmit = &ray_dev_start_xmit; dev->hard_start_xmit = &ray_dev_start_xmit;
dev->set_config = &ray_dev_config; dev->set_config = &ray_dev_config;
dev->get_stats = &ray_get_stats; dev->get_stats = &ray_get_stats;
dev->do_ioctl = &ray_dev_ioctl;
SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
#if WIRELESS_EXT > 7 /* If wireless extension exist in the kernel */ dev->wireless_handlers = &ray_handler_def;
dev->get_wireless_stats = ray_get_wireless_stats; #ifdef WIRELESS_SPY
#endif local->wireless_data.spy_data = &local->spy_data;
dev->wireless_data = &local->wireless_data;
#endif /* WIRELESS_SPY */
dev->set_multicast_list = &set_multicast_list; dev->set_multicast_list = &set_multicast_list;
@ -1201,248 +1200,296 @@ static struct ethtool_ops netdev_ethtool_ops = {
/*====================================================================*/ /*====================================================================*/
static int ray_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*------------------------------------------------------------------*/
/*
* Wireless Handler : get protocol name
*/
static int ray_get_name(struct net_device *dev,
struct iw_request_info *info,
char *cwrq,
char *extra)
{
strcpy(cwrq, "IEEE 802.11-FH");
return 0;
}
/*------------------------------------------------------------------*/
/*
* Wireless Handler : set frequency
*/
static int ray_set_freq(struct net_device *dev,
struct iw_request_info *info,
struct iw_freq *fwrq,
char *extra)
{ {
ray_dev_t *local = (ray_dev_t *)dev->priv; ray_dev_t *local = (ray_dev_t *)dev->priv;
dev_link_t *link = local->finder; int err = -EINPROGRESS; /* Call commit handler */
int err = 0;
#if WIRELESS_EXT > 7
struct iwreq *wrq = (struct iwreq *) ifr;
#endif /* WIRELESS_EXT > 7 */
#ifdef WIRELESS_SPY
struct sockaddr address[IW_MAX_SPY];
#endif /* WIRELESS_SPY */
if (!(link->state & DEV_PRESENT)) {
DEBUG(2,"ray_dev_ioctl - device not present\n");
return -1;
}
DEBUG(2,"ray_cs IOCTL dev=%p, ifr=%p, cmd = 0x%x\n",dev,ifr,cmd);
/* Validate the command */
switch (cmd)
{
#if WIRELESS_EXT > 7
/* --------------- WIRELESS EXTENSIONS --------------- */
/* Get name */
case SIOCGIWNAME:
strcpy(wrq->u.name, "IEEE 802.11-FH");
break;
/* Get frequency/channel */
case SIOCGIWFREQ:
wrq->u.freq.m = local->sparm.b5.a_hop_pattern;
wrq->u.freq.e = 0;
break;
/* Set frequency/channel */
case SIOCSIWFREQ:
/* Reject if card is already initialised */ /* Reject if card is already initialised */
if(local->card_status != CARD_AWAITING_PARAM) if(local->card_status != CARD_AWAITING_PARAM)
{ return -EBUSY;
err = -EBUSY;
break;
}
/* Setting by channel number */ /* Setting by channel number */
if ((wrq->u.freq.m > USA_HOP_MOD) || (wrq->u.freq.e > 0)) if ((fwrq->m > USA_HOP_MOD) || (fwrq->e > 0))
err = -EOPNOTSUPP; err = -EOPNOTSUPP;
else else
local->sparm.b5.a_hop_pattern = wrq->u.freq.m; local->sparm.b5.a_hop_pattern = fwrq->m;
break;
/* Get current network name (ESSID) */ return err;
case SIOCGIWESSID:
if (wrq->u.data.pointer)
{
char essid[IW_ESSID_MAX_SIZE + 1];
/* Get the essid that was set */
memcpy(essid, local->sparm.b5.a_current_ess_id,
IW_ESSID_MAX_SIZE);
essid[IW_ESSID_MAX_SIZE] = '\0';
/* Push it out ! */
wrq->u.data.length = strlen(essid) + 1;
wrq->u.data.flags = 1; /* active */
if (copy_to_user(wrq->u.data.pointer, essid, sizeof(essid)))
err = -EFAULT;
} }
break;
/* Set desired network name (ESSID) */ /*------------------------------------------------------------------*/
case SIOCSIWESSID: /*
* Wireless Handler : get frequency
*/
static int ray_get_freq(struct net_device *dev,
struct iw_request_info *info,
struct iw_freq *fwrq,
char *extra)
{
ray_dev_t *local = (ray_dev_t *)dev->priv;
fwrq->m = local->sparm.b5.a_hop_pattern;
fwrq->e = 0;
return 0;
}
/*------------------------------------------------------------------*/
/*
* Wireless Handler : set ESSID
*/
static int ray_set_essid(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *dwrq,
char *extra)
{
ray_dev_t *local = (ray_dev_t *)dev->priv;
/* Reject if card is already initialised */ /* Reject if card is already initialised */
if(local->card_status != CARD_AWAITING_PARAM) if(local->card_status != CARD_AWAITING_PARAM)
{ return -EBUSY;
err = -EBUSY;
break;
}
if (wrq->u.data.pointer)
{
char card_essid[IW_ESSID_MAX_SIZE + 1];
/* Check if we asked for `any' */ /* Check if we asked for `any' */
if(wrq->u.data.flags == 0) if(dwrq->flags == 0) {
{
/* Corey : can you do that ? */ /* Corey : can you do that ? */
err = -EOPNOTSUPP; return -EOPNOTSUPP;
} } else {
else
{
/* Check the size of the string */ /* Check the size of the string */
if(wrq->u.data.length > if(dwrq->length > IW_ESSID_MAX_SIZE + 1) {
IW_ESSID_MAX_SIZE + 1) return -E2BIG;
{
err = -E2BIG;
break;
} }
if (copy_from_user(card_essid,
wrq->u.data.pointer,
wrq->u.data.length)) {
err = -EFAULT;
break;
}
card_essid[IW_ESSID_MAX_SIZE] = '\0';
/* Set the ESSID in the card */ /* Set the ESSID in the card */
memcpy(local->sparm.b5.a_current_ess_id, card_essid, memset(local->sparm.b5.a_current_ess_id, 0, IW_ESSID_MAX_SIZE);
IW_ESSID_MAX_SIZE); memcpy(local->sparm.b5.a_current_ess_id, extra, dwrq->length);
} }
return -EINPROGRESS; /* Call commit handler */
} }
break;
/* Get current Access Point (BSSID in our case) */ /*------------------------------------------------------------------*/
case SIOCGIWAP: /*
memcpy(wrq->u.ap_addr.sa_data, local->bss_id, ETH_ALEN); * Wireless Handler : get ESSID
wrq->u.ap_addr.sa_family = ARPHRD_ETHER; */
break; static int ray_get_essid(struct net_device *dev,
struct iw_request_info *info,
/* Get the current bit-rate */ struct iw_point *dwrq,
case SIOCGIWRATE: char *extra)
if(local->net_default_tx_rate == 3)
wrq->u.bitrate.value = 2000000; /* Hum... */
else
wrq->u.bitrate.value = local->net_default_tx_rate * 500000;
wrq->u.bitrate.fixed = 0; /* We are in auto mode */
break;
/* Set the desired bit-rate */
case SIOCSIWRATE:
/* Check if rate is in range */
if((wrq->u.bitrate.value != 1000000) &&
(wrq->u.bitrate.value != 2000000))
{ {
err = -EINVAL; ray_dev_t *local = (ray_dev_t *)dev->priv;
break;
/* Get the essid that was set */
memcpy(extra, local->sparm.b5.a_current_ess_id, IW_ESSID_MAX_SIZE);
extra[IW_ESSID_MAX_SIZE] = '\0';
/* Push it out ! */
dwrq->length = strlen(extra) + 1;
dwrq->flags = 1; /* active */
return 0;
} }
/* Hack for 1.5 Mb/s instead of 2 Mb/s */
if((local->fw_ver == 0x55) && /* Please check */
(wrq->u.bitrate.value == 2000000))
local->net_default_tx_rate = 3;
else
local->net_default_tx_rate = wrq->u.bitrate.value/500000;
break;
/* Get the current RTS threshold */ /*------------------------------------------------------------------*/
case SIOCGIWRTS: /*
wrq->u.rts.value = (local->sparm.b5.a_rts_threshold[0] << 8) * Wireless Handler : get AP address
+ local->sparm.b5.a_rts_threshold[1]; */
#if WIRELESS_EXT > 8 static int ray_get_wap(struct net_device *dev,
wrq->u.rts.disabled = (wrq->u.rts.value == 32767); struct iw_request_info *info,
#endif /* WIRELESS_EXT > 8 */ struct sockaddr *awrq,
wrq->u.rts.fixed = 1; char *extra)
break;
/* Set the desired RTS threshold */
case SIOCSIWRTS:
{ {
int rthr = wrq->u.rts.value; ray_dev_t *local = (ray_dev_t *)dev->priv;
memcpy(awrq->sa_data, local->bss_id, ETH_ALEN);
awrq->sa_family = ARPHRD_ETHER;
return 0;
}
/*------------------------------------------------------------------*/
/*
* Wireless Handler : set Bit-Rate
*/
static int ray_set_rate(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *vwrq,
char *extra)
{
ray_dev_t *local = (ray_dev_t *)dev->priv;
/* Reject if card is already initialised */ /* Reject if card is already initialised */
if(local->card_status != CARD_AWAITING_PARAM) if(local->card_status != CARD_AWAITING_PARAM)
{ return -EBUSY;
err = -EBUSY;
break; /* Check if rate is in range */
if((vwrq->value != 1000000) && (vwrq->value != 2000000))
return -EINVAL;
/* Hack for 1.5 Mb/s instead of 2 Mb/s */
if((local->fw_ver == 0x55) && /* Please check */
(vwrq->value == 2000000))
local->net_default_tx_rate = 3;
else
local->net_default_tx_rate = vwrq->value/500000;
return 0;
} }
/* if(wrq->u.rts.fixed == 0) we should complain */ /*------------------------------------------------------------------*/
#if WIRELESS_EXT > 8 /*
if(wrq->u.rts.disabled) * Wireless Handler : get Bit-Rate
rthr = 32767; */
else static int ray_get_rate(struct net_device *dev,
#endif /* WIRELESS_EXT > 8 */ struct iw_request_info *info,
if((rthr < 0) || (rthr > 2347)) /* What's the max packet size ??? */ struct iw_param *vwrq,
char *extra)
{ {
err = -EINVAL; ray_dev_t *local = (ray_dev_t *)dev->priv;
break;
if(local->net_default_tx_rate == 3)
vwrq->value = 2000000; /* Hum... */
else
vwrq->value = local->net_default_tx_rate * 500000;
vwrq->fixed = 0; /* We are in auto mode */
return 0;
}
/*------------------------------------------------------------------*/
/*
* Wireless Handler : set RTS threshold
*/
static int ray_set_rts(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *vwrq,
char *extra)
{
ray_dev_t *local = (ray_dev_t *)dev->priv;
int rthr = vwrq->value;
/* Reject if card is already initialised */
if(local->card_status != CARD_AWAITING_PARAM)
return -EBUSY;
/* if(wrq->u.rts.fixed == 0) we should complain */
if(vwrq->disabled)
rthr = 32767;
else {
if((rthr < 0) || (rthr > 2347)) /* What's the max packet size ??? */
return -EINVAL;
} }
local->sparm.b5.a_rts_threshold[0] = (rthr >> 8) & 0xFF; local->sparm.b5.a_rts_threshold[0] = (rthr >> 8) & 0xFF;
local->sparm.b5.a_rts_threshold[1] = rthr & 0xFF; local->sparm.b5.a_rts_threshold[1] = rthr & 0xFF;
return -EINPROGRESS; /* Call commit handler */
} }
break;
/* Get the current fragmentation threshold */
case SIOCGIWFRAG:
wrq->u.frag.value = (local->sparm.b5.a_frag_threshold[0] << 8)
+ local->sparm.b5.a_frag_threshold[1];
#if WIRELESS_EXT > 8
wrq->u.frag.disabled = (wrq->u.frag.value == 32767);
#endif /* WIRELESS_EXT > 8 */
wrq->u.frag.fixed = 1;
break;
/* Set the desired fragmentation threshold */ /*------------------------------------------------------------------*/
case SIOCSIWFRAG: /*
* Wireless Handler : get RTS threshold
*/
static int ray_get_rts(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *vwrq,
char *extra)
{ {
int fthr = wrq->u.frag.value; ray_dev_t *local = (ray_dev_t *)dev->priv;
vwrq->value = (local->sparm.b5.a_rts_threshold[0] << 8)
+ local->sparm.b5.a_rts_threshold[1];
vwrq->disabled = (vwrq->value == 32767);
vwrq->fixed = 1;
return 0;
}
/*------------------------------------------------------------------*/
/*
* Wireless Handler : set Fragmentation threshold
*/
static int ray_set_frag(struct net_device *dev,
struct iw_request_info *info,
struct iw_param *vwrq,
char *extra)
{
ray_dev_t *local = (ray_dev_t *)dev->priv;
int fthr = vwrq->value;
/* Reject if card is already initialised */ /* Reject if card is already initialised */
if(local->card_status != CARD_AWAITING_PARAM) if(local->card_status != CARD_AWAITING_PARAM)
{ return -EBUSY;
err = -EBUSY;
break;
}
/* if(wrq->u.frag.fixed == 0) should complain */ /* if(wrq->u.frag.fixed == 0) should complain */
#if WIRELESS_EXT > 8 if(vwrq->disabled)
if(wrq->u.frag.disabled)
fthr = 32767; fthr = 32767;
else else {
#endif /* WIRELESS_EXT > 8 */
if((fthr < 256) || (fthr > 2347)) /* To check out ! */ if((fthr < 256) || (fthr > 2347)) /* To check out ! */
{ return -EINVAL;
err = -EINVAL;
break;
} }
local->sparm.b5.a_frag_threshold[0] = (fthr >> 8) & 0xFF; local->sparm.b5.a_frag_threshold[0] = (fthr >> 8) & 0xFF;
local->sparm.b5.a_frag_threshold[1] = fthr & 0xFF; local->sparm.b5.a_frag_threshold[1] = fthr & 0xFF;
return -EINPROGRESS; /* Call commit handler */
} }
break;
#endif /* WIRELESS_EXT > 7 */ /*------------------------------------------------------------------*/
#if WIRELESS_EXT > 8 /*
* Wireless Handler : get Fragmentation threshold
/* Get the current mode of operation */ */
case SIOCGIWMODE: static int ray_get_frag(struct net_device *dev,
if(local->sparm.b5.a_network_type) struct iw_request_info *info,
wrq->u.mode = IW_MODE_INFRA; struct iw_param *vwrq,
else char *extra)
wrq->u.mode = IW_MODE_ADHOC;
break;
/* Set the current mode of operation */
case SIOCSIWMODE:
{ {
ray_dev_t *local = (ray_dev_t *)dev->priv;
vwrq->value = (local->sparm.b5.a_frag_threshold[0] << 8)
+ local->sparm.b5.a_frag_threshold[1];
vwrq->disabled = (vwrq->value == 32767);
vwrq->fixed = 1;
return 0;
}
/*------------------------------------------------------------------*/
/*
* Wireless Handler : set Mode of Operation
*/
static int ray_set_mode(struct net_device *dev,
struct iw_request_info *info,
__u32 *uwrq,
char *extra)
{
ray_dev_t *local = (ray_dev_t *)dev->priv;
int err = -EINPROGRESS; /* Call commit handler */
char card_mode = 1; char card_mode = 1;
/* Reject if card is already initialised */ /* Reject if card is already initialised */
if(local->card_status != CARD_AWAITING_PARAM) if(local->card_status != CARD_AWAITING_PARAM)
{ return -EBUSY;
err = -EBUSY;
break;
}
switch (wrq->u.mode) switch (*uwrq)
{ {
case IW_MODE_ADHOC: case IW_MODE_ADHOC:
card_mode = 0; card_mode = 0;
@ -1453,184 +1500,120 @@ static int ray_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
default: default:
err = -EINVAL; err = -EINVAL;
} }
}
break;
#endif /* WIRELESS_EXT > 8 */ return err;
#if WIRELESS_EXT > 7 }
/* ------------------ IWSPY SUPPORT ------------------ */
/* Define the range (variations) of above parameters */ /*------------------------------------------------------------------*/
case SIOCGIWRANGE: /*
/* Basic checking... */ * Wireless Handler : get Mode of Operation
if(wrq->u.data.pointer != (caddr_t) 0) */
static int ray_get_mode(struct net_device *dev,
struct iw_request_info *info,
__u32 *uwrq,
char *extra)
{ {
struct iw_range range; ray_dev_t *local = (ray_dev_t *)dev->priv;
memset((char *) &range, 0, sizeof(struct iw_range));
if(local->sparm.b5.a_network_type)
*uwrq = IW_MODE_INFRA;
else
*uwrq = IW_MODE_ADHOC;
return 0;
}
/*------------------------------------------------------------------*/
/*
* Wireless Handler : get range info
*/
static int ray_get_range(struct net_device *dev,
struct iw_request_info *info,
struct iw_point *dwrq,
char *extra)
{
struct iw_range *range = (struct iw_range *) extra;
memset((char *) range, 0, sizeof(struct iw_range));
/* Set the length (very important for backward compatibility) */ /* Set the length (very important for backward compatibility) */
wrq->u.data.length = sizeof(struct iw_range); dwrq->length = sizeof(struct iw_range);
#if WIRELESS_EXT > 10
/* Set the Wireless Extension versions */ /* Set the Wireless Extension versions */
range.we_version_compiled = WIRELESS_EXT; range->we_version_compiled = WIRELESS_EXT;
range.we_version_source = 9; range->we_version_source = 9;
#endif /* WIRELESS_EXT > 10 */
/* Set information in the range struct */ /* Set information in the range struct */
range.throughput = 1.1 * 1000 * 1000; /* Put the right number here */ range->throughput = 1.1 * 1000 * 1000; /* Put the right number here */
range.num_channels = hop_pattern_length[(int)country]; range->num_channels = hop_pattern_length[(int)country];
range.num_frequency = 0; range->num_frequency = 0;
range.max_qual.qual = 0; range->max_qual.qual = 0;
range.max_qual.level = 255; /* What's the correct value ? */ range->max_qual.level = 255; /* What's the correct value ? */
range.max_qual.noise = 255; /* Idem */ range->max_qual.noise = 255; /* Idem */
range.num_bitrates = 2; range->num_bitrates = 2;
range.bitrate[0] = 1000000; /* 1 Mb/s */ range->bitrate[0] = 1000000; /* 1 Mb/s */
range.bitrate[1] = 2000000; /* 2 Mb/s */ range->bitrate[1] = 2000000; /* 2 Mb/s */
return 0;
/* Copy structure to the user buffer */
if(copy_to_user(wrq->u.data.pointer, &range,
sizeof(struct iw_range)))
err = -EFAULT;
} }
break;
#ifdef WIRELESS_SPY /*------------------------------------------------------------------*/
/* Set addresses to spy */ /*
case SIOCSIWSPY: * Wireless Private Handler : set framing mode
/* Check the number of addresses */ */
if(wrq->u.data.length > IW_MAX_SPY) static int ray_set_framing(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu,
char *extra)
{ {
err = -E2BIG; translate = *(extra); /* Set framing mode */
break;
}
local->spy_number = wrq->u.data.length;
/* If there is some addresses to copy */ return 0;
if(local->spy_number > 0) }
/*------------------------------------------------------------------*/
/*
* Wireless Private Handler : get framing mode
*/
static int ray_get_framing(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu,
char *extra)
{ {
int i; *(extra) = translate;
/* Copy addresses to the driver */ return 0;
if(copy_from_user(address, wrq->u.data.pointer, }
sizeof(struct sockaddr) * local->spy_number))
/*------------------------------------------------------------------*/
/*
* Wireless Private Handler : get country
*/
static int ray_get_country(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu,
char *extra)
{ {
err = -EFAULT; *(extra) = country;
break;
return 0;
} }
/* Copy addresses to the lp structure */ /*------------------------------------------------------------------*/
for(i = 0; i < local->spy_number; i++) /*
memcpy(local->spy_address[i], address[i].sa_data, ETH_ALEN); * Commit handler : called after a bunch of SET operations
*/
/* Reset structure... */ static int ray_commit(struct net_device *dev,
memset(local->spy_stat, 0x00, sizeof(iw_qual) * IW_MAX_SPY); struct iw_request_info *info, /* NULL */
void *zwrq, /* NULL */
#ifdef DEBUG_IOCTL_INFO char *extra) /* NULL */
printk(KERN_DEBUG "SetSpy - Set of new addresses is :\n");
for(i = 0; i < local->spy_number; i++)
printk(KERN_DEBUG "%02X:%02X:%02X:%02X:%02X:%02X\n",
local->spy_address[i][0],
local->spy_address[i][1],
local->spy_address[i][2],
local->spy_address[i][3],
local->spy_address[i][4],
local->spy_address[i][5]);
#endif /* DEBUG_IOCTL_INFO */
}
break;
/* Get the spy list and spy stats */
case SIOCGIWSPY:
/* Set the number of addresses */
wrq->u.data.length = local->spy_number;
/* If the user want to have the addresses back... */
if((local->spy_number > 0) && (wrq->u.data.pointer != (caddr_t) 0))
{ {
int i; return 0;
/* Copy addresses from the lp structure */
for(i = 0; i < local->spy_number; i++)
{
memcpy(address[i].sa_data, local->spy_address[i], ETH_ALEN);
address[i].sa_family = ARPHRD_ETHER;
} }
/* Copy addresses to the user buffer */ /*------------------------------------------------------------------*/
if(copy_to_user(wrq->u.data.pointer, address, /*
sizeof(struct sockaddr) * local->spy_number)) * Stats handler : return Wireless Stats
{ */
err = -EFAULT;
break;
}
/* Copy stats to the user buffer (just after) */
if(copy_to_user(wrq->u.data.pointer +
(sizeof(struct sockaddr) * local->spy_number),
local->spy_stat, sizeof(iw_qual) * local->spy_number))
{
err = -EFAULT;
break;
}
/* Reset updated flags */
for(i = 0; i < local->spy_number; i++)
local->spy_stat[i].updated = 0x0;
} /* if(pointer != NULL) */
break;
#endif /* WIRELESS_SPY */
/* ------------------ PRIVATE IOCTL ------------------ */
#ifndef SIOCIWFIRSTPRIV
#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE
#endif /* SIOCIWFIRSTPRIV */
#define SIOCSIPFRAMING SIOCIWFIRSTPRIV /* Set framing mode */
#define SIOCGIPFRAMING SIOCIWFIRSTPRIV + 1 /* Get framing mode */
#define SIOCGIPCOUNTRY SIOCIWFIRSTPRIV + 3 /* Get country code */
case SIOCSIPFRAMING:
if(!capable(CAP_NET_ADMIN)) /* For private IOCTLs, we need to check permissions */
{
err = -EPERM;
break;
}
translate = *(wrq->u.name); /* Set framing mode */
break;
case SIOCGIPFRAMING:
*(wrq->u.name) = translate;
break;
case SIOCGIPCOUNTRY:
*(wrq->u.name) = country;
break;
case SIOCGIWPRIV:
/* Export our "private" intercace */
if(wrq->u.data.pointer != (caddr_t) 0)
{
struct iw_priv_args priv[] =
{ /* cmd, set_args, get_args, name */
{ SIOCSIPFRAMING, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, 0, "set_framing" },
{ SIOCGIPFRAMING, 0, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, "get_framing" },
{ SIOCGIPCOUNTRY, 0, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, "get_country" },
};
/* Set the number of ioctl available */
wrq->u.data.length = 3;
/* Copy structure to the user buffer */
if(copy_to_user(wrq->u.data.pointer, (u_char *) priv,
sizeof(priv)))
err = -EFAULT;
}
break;
#endif /* WIRELESS_EXT > 7 */
default:
DEBUG(0,"ray_dev_ioctl cmd = 0x%x\n", cmd);
err = -EOPNOTSUPP;
}
return err;
} /* end ray_dev_ioctl */
/*===========================================================================*/
#if WIRELESS_EXT > 7 /* If wireless extension exist in the kernel */
static iw_stats * ray_get_wireless_stats(struct net_device * dev) static iw_stats * ray_get_wireless_stats(struct net_device * dev)
{ {
ray_dev_t * local = (ray_dev_t *) dev->priv; ray_dev_t * local = (ray_dev_t *) dev->priv;
@ -1642,13 +1625,13 @@ static iw_stats * ray_get_wireless_stats(struct net_device * dev)
local->wstats.status = local->card_status; local->wstats.status = local->card_status;
#ifdef WIRELESS_SPY #ifdef WIRELESS_SPY
if((local->spy_number > 0) && (local->sparm.b5.a_network_type == 0)) if((local->spy_data.spy_number > 0) && (local->sparm.b5.a_network_type == 0))
{ {
/* Get it from the first node in spy list */ /* Get it from the first node in spy list */
local->wstats.qual.qual = local->spy_stat[0].qual; local->wstats.qual.qual = local->spy_data.spy_stat[0].qual;
local->wstats.qual.level = local->spy_stat[0].level; local->wstats.qual.level = local->spy_data.spy_stat[0].level;
local->wstats.qual.noise = local->spy_stat[0].noise; local->wstats.qual.noise = local->spy_data.spy_stat[0].noise;
local->wstats.qual.updated = local->spy_stat[0].updated; local->wstats.qual.updated = local->spy_data.spy_stat[0].updated;
} }
#endif /* WIRELESS_SPY */ #endif /* WIRELESS_SPY */
@ -1659,7 +1642,65 @@ static iw_stats * ray_get_wireless_stats(struct net_device * dev)
return &local->wstats; return &local->wstats;
} /* end ray_get_wireless_stats */ } /* end ray_get_wireless_stats */
#endif /* WIRELESS_EXT > 7 */
/*------------------------------------------------------------------*/
/*
* Structures to export the Wireless Handlers
*/
static const iw_handler ray_handler[] = {
[SIOCSIWCOMMIT-SIOCIWFIRST] (iw_handler) ray_commit,
[SIOCGIWNAME -SIOCIWFIRST] (iw_handler) ray_get_name,
[SIOCSIWFREQ -SIOCIWFIRST] (iw_handler) ray_set_freq,
[SIOCGIWFREQ -SIOCIWFIRST] (iw_handler) ray_get_freq,
[SIOCSIWMODE -SIOCIWFIRST] (iw_handler) ray_set_mode,
[SIOCGIWMODE -SIOCIWFIRST] (iw_handler) ray_get_mode,
[SIOCGIWRANGE -SIOCIWFIRST] (iw_handler) ray_get_range,
#ifdef WIRELESS_SPY
[SIOCSIWSPY -SIOCIWFIRST] (iw_handler) iw_handler_set_spy,
[SIOCGIWSPY -SIOCIWFIRST] (iw_handler) iw_handler_get_spy,
[SIOCSIWTHRSPY-SIOCIWFIRST] (iw_handler) iw_handler_set_thrspy,
[SIOCGIWTHRSPY-SIOCIWFIRST] (iw_handler) iw_handler_get_thrspy,
#endif /* WIRELESS_SPY */
[SIOCGIWAP -SIOCIWFIRST] (iw_handler) ray_get_wap,
[SIOCSIWESSID -SIOCIWFIRST] (iw_handler) ray_set_essid,
[SIOCGIWESSID -SIOCIWFIRST] (iw_handler) ray_get_essid,
[SIOCSIWRATE -SIOCIWFIRST] (iw_handler) ray_set_rate,
[SIOCGIWRATE -SIOCIWFIRST] (iw_handler) ray_get_rate,
[SIOCSIWRTS -SIOCIWFIRST] (iw_handler) ray_set_rts,
[SIOCGIWRTS -SIOCIWFIRST] (iw_handler) ray_get_rts,
[SIOCSIWFRAG -SIOCIWFIRST] (iw_handler) ray_set_frag,
[SIOCGIWFRAG -SIOCIWFIRST] (iw_handler) ray_get_frag,
};
#define SIOCSIPFRAMING SIOCIWFIRSTPRIV /* Set framing mode */
#define SIOCGIPFRAMING SIOCIWFIRSTPRIV + 1 /* Get framing mode */
#define SIOCGIPCOUNTRY SIOCIWFIRSTPRIV + 3 /* Get country code */
static const iw_handler ray_private_handler[] = {
[0] (iw_handler) ray_set_framing,
[1] (iw_handler) ray_get_framing,
[3] (iw_handler) ray_get_country,
};
static const struct iw_priv_args ray_private_args[] = {
/* cmd, set_args, get_args, name */
{ SIOCSIPFRAMING, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, 0, "set_framing" },
{ SIOCGIPFRAMING, 0, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, "get_framing" },
{ SIOCGIPCOUNTRY, 0, IW_PRIV_TYPE_BYTE | IW_PRIV_SIZE_FIXED | 1, "get_country" },
};
static const struct iw_handler_def ray_handler_def =
{
.num_standard = sizeof(ray_handler)/sizeof(iw_handler),
.num_private = sizeof(ray_private_handler)/sizeof(iw_handler),
.num_private_args = sizeof(ray_private_args)/sizeof(struct iw_priv_args),
.standard = ray_handler,
.private = ray_private_handler,
.private_args = ray_private_args,
.get_wireless_stats = ray_get_wireless_stats,
};
/*===========================================================================*/ /*===========================================================================*/
static int ray_open(struct net_device *dev) static int ray_open(struct net_device *dev)
{ {
@ -2392,20 +2433,15 @@ static void rx_data(struct net_device *dev, struct rcs __iomem *prcs, unsigned i
/*local->wstats.qual.noise = none ? */ /*local->wstats.qual.noise = none ? */
local->wstats.qual.updated = 0x2; local->wstats.qual.updated = 0x2;
} }
/* Now, for the addresses in the spy list */ /* Now, update the spy stuff */
{ {
int i; struct iw_quality wstats;
/* Look all addresses */ wstats.level = siglev;
for(i = 0; i < local->spy_number; i++) /* wstats.noise = none ? */
/* If match */ /* wstats.qual = none ? */
if(!memcmp(linksrcaddr, local->spy_address[i], ETH_ALEN)) wstats.updated = 0x2;
{ /* Update spy records */
/* Update statistics */ wireless_spy_update(dev, linksrcaddr, &wstats);
/*local->spy_stat[i].qual = none ? */
local->spy_stat[i].level = siglev;
/*local->spy_stat[i].noise = none ? */
local->spy_stat[i].updated = 0x2;
}
} }
#endif /* WIRELESS_SPY */ #endif /* WIRELESS_SPY */
} /* end rx_data */ } /* end rx_data */

7
drivers/net/wireless/ray_cs.h
View file

@ -63,13 +63,10 @@ typedef struct ray_dev_t {
UCHAR last_rsl; UCHAR last_rsl;
int beacon_rxed; int beacon_rxed;
struct beacon_rx last_bcn; struct beacon_rx last_bcn;
#ifdef WIRELESS_EXT
iw_stats wstats; /* Wireless specific stats */ iw_stats wstats; /* Wireless specific stats */
#endif
#ifdef WIRELESS_SPY #ifdef WIRELESS_SPY
int spy_number; /* Number of addresses to spy */ struct iw_spy_data spy_data;
mac_addr spy_address[IW_MAX_SPY + 1]; /* The addresses to spy */ struct iw_public_data wireless_data;
iw_qual spy_stat[IW_MAX_SPY + 1]; /* Statistics gathered */
#endif /* WIRELESS_SPY */ #endif /* WIRELESS_SPY */
} ray_dev_t; } ray_dev_t;

1
drivers/net/wireless/wl3501.h
View file

@ -609,6 +609,7 @@ struct wl3501_card {
struct net_device_stats stats; struct net_device_stats stats;
struct iw_statistics wstats; struct iw_statistics wstats;
struct iw_spy_data spy_data; struct iw_spy_data spy_data;
struct iw_public_data wireless_data;
struct dev_node_t node; struct dev_node_t node;
}; };
#endif #endif

7
drivers/net/wireless/wl3501_cs.c
View file

@ -1944,7 +1944,7 @@ static const iw_handler wl3501_handler[] = {
static const struct iw_handler_def wl3501_handler_def = { static const struct iw_handler_def wl3501_handler_def = {
.num_standard = sizeof(wl3501_handler) / sizeof(iw_handler), .num_standard = sizeof(wl3501_handler) / sizeof(iw_handler),
.standard = (iw_handler *)wl3501_handler, .standard = (iw_handler *)wl3501_handler,
.spy_offset = offsetof(struct wl3501_card, spy_data), .get_wireless_stats = wl3501_get_wireless_stats,
}; };
/** /**
@ -1961,6 +1961,7 @@ static dev_link_t *wl3501_attach(void)
client_reg_t client_reg; client_reg_t client_reg;
dev_link_t *link; dev_link_t *link;
struct net_device *dev; struct net_device *dev;
struct wl3501_card *this;
int ret; int ret;
/* Initialize the dev_link_t structure */ /* Initialize the dev_link_t structure */
@ -1995,7 +1996,9 @@ static dev_link_t *wl3501_attach(void)
dev->tx_timeout = wl3501_tx_timeout; dev->tx_timeout = wl3501_tx_timeout;
dev->watchdog_timeo = 5 * HZ; dev->watchdog_timeo = 5 * HZ;
dev->get_stats = wl3501_get_stats; dev->get_stats = wl3501_get_stats;
dev->get_wireless_stats = wl3501_get_wireless_stats; this = dev->priv;
this->wireless_data.spy_data = &this->spy_data;
dev->wireless_data = &this->wireless_data;
dev->wireless_handlers = (struct iw_handler_def *)&wl3501_handler_def; dev->wireless_handlers = (struct iw_handler_def *)&wl3501_handler_def;
SET_ETHTOOL_OPS(dev, &ops); SET_ETHTOOL_OPS(dev, &ops);
netif_stop_queue(dev); netif_stop_queue(dev);

20
drivers/s390/net/claw.c
View file

@ -2,9 +2,9 @@
* drivers/s390/net/claw.c * drivers/s390/net/claw.c
* ESCON CLAW network driver * ESCON CLAW network driver
* *
* $Revision: 1.35 $ $Date: 2005/03/24 12:25:38 $ * $Revision: 1.38 $ $Date: 2005/08/29 09:47:04 $
* *
* Linux fo zSeries version * Linux for zSeries version
* Copyright (C) 2002,2005 IBM Corporation * Copyright (C) 2002,2005 IBM Corporation
* Author(s) Original code written by: * Author(s) Original code written by:
* Kazuo Iimura (iimura@jp.ibm.com) * Kazuo Iimura (iimura@jp.ibm.com)
@ -431,12 +431,12 @@ claw_pack_skb(struct claw_privbk *privptr)
if (!skb_queue_empty(&p_ch->collect_queue)) { if (!skb_queue_empty(&p_ch->collect_queue)) {
/* some data */ /* some data */
held_skb = skb_dequeue(&p_ch->collect_queue); held_skb = skb_dequeue(&p_ch->collect_queue);
if (p_env->packing != DO_PACKED)
return held_skb;
if (held_skb) if (held_skb)
atomic_dec(&held_skb->users); dev_kfree_skb_any(held_skb);
else else
return NULL; return NULL;
if (p_env->packing != DO_PACKED)
return held_skb;
/* get a new SKB we will pack at least one */ /* get a new SKB we will pack at least one */
new_skb = dev_alloc_skb(p_env->write_size); new_skb = dev_alloc_skb(p_env->write_size);
if (new_skb == NULL) { if (new_skb == NULL) {
@ -455,7 +455,7 @@ claw_pack_skb(struct claw_privbk *privptr)
privptr->stats.tx_packets++; privptr->stats.tx_packets++;
so_far += held_skb->len; so_far += held_skb->len;
pkt_cnt++; pkt_cnt++;
dev_kfree_skb_irq(held_skb); dev_kfree_skb_any(held_skb);
held_skb = skb_dequeue(&p_ch->collect_queue); held_skb = skb_dequeue(&p_ch->collect_queue);
if (held_skb) if (held_skb)
atomic_dec(&held_skb->users); atomic_dec(&held_skb->users);
@ -1092,7 +1092,7 @@ claw_release(struct net_device *dev)
} }
} }
if (privptr->pk_skb != NULL) { if (privptr->pk_skb != NULL) {
dev_kfree_skb(privptr->pk_skb); dev_kfree_skb_any(privptr->pk_skb);
privptr->pk_skb = NULL; privptr->pk_skb = NULL;
} }
if(privptr->buffs_alloc != 1) { if(privptr->buffs_alloc != 1) {
@ -2016,7 +2016,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid)
p_buf=(struct ccwbk*)privptr->p_end_ccw; p_buf=(struct ccwbk*)privptr->p_end_ccw;
dumpit((char *)p_buf, sizeof(struct endccw)); dumpit((char *)p_buf, sizeof(struct endccw));
#endif #endif
dev_kfree_skb(skb); dev_kfree_skb_any(skb);
if (linkid==0) { if (linkid==0) {
lock=LOCK_NO; lock=LOCK_NO;
} }
@ -4061,7 +4061,7 @@ claw_purge_skb_queue(struct sk_buff_head *q)
while ((skb = skb_dequeue(q))) { while ((skb = skb_dequeue(q))) {
atomic_dec(&skb->users); atomic_dec(&skb->users);
dev_kfree_skb_irq(skb); dev_kfree_skb_any(skb);
} }
} }
@ -4410,7 +4410,7 @@ claw_init(void)
#else #else
"compiled into kernel " "compiled into kernel "
#endif #endif
" $Revision: 1.35 $ $Date: 2005/03/24 12:25:38 $ \n"); " $Revision: 1.38 $ $Date: 2005/08/29 09:47:04 $ \n");
#ifdef FUNCTRACE #ifdef FUNCTRACE

1
include/linux/pci_ids.h
View file

@ -1612,6 +1612,7 @@
#define PCI_DEVICE_ID_TOSHIBA_TC35815CF 0x0030 #define PCI_DEVICE_ID_TOSHIBA_TC35815CF 0x0030
#define PCI_DEVICE_ID_TOSHIBA_TX4927 0x0180 #define PCI_DEVICE_ID_TOSHIBA_TX4927 0x0180
#define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC 0x0108 #define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC 0x0108
#define PCI_DEVICE_ID_TOSHIBA_SPIDER_NET 0x01b3
#define PCI_VENDOR_ID_RICOH 0x1180 #define PCI_VENDOR_ID_RICOH 0x1180
#define PCI_DEVICE_ID_RICOH_RL5C465 0x0465 #define PCI_DEVICE_ID_RICOH_RL5C465 0x0465

38
include/linux/wireless.h
View file

@ -1,7 +1,7 @@
/* /*
* This file define a set of standard wireless extensions * This file define a set of standard wireless extensions
* *
* Version : 18 12.3.05 * Version : 19 18.3.05
* *
* Authors : Jean Tourrilhes - HPL - <jt@hpl.hp.com> * Authors : Jean Tourrilhes - HPL - <jt@hpl.hp.com>
* Copyright (c) 1997-2005 Jean Tourrilhes, All Rights Reserved. * Copyright (c) 1997-2005 Jean Tourrilhes, All Rights Reserved.
@ -69,8 +69,6 @@
/***************************** INCLUDES *****************************/ /***************************** INCLUDES *****************************/
/* To minimise problems in user space, I might remove those headers
* at some point. Jean II */
#include <linux/types.h> /* for "caddr_t" et al */ #include <linux/types.h> /* for "caddr_t" et al */
#include <linux/socket.h> /* for "struct sockaddr" et al */ #include <linux/socket.h> /* for "struct sockaddr" et al */
#include <linux/if.h> /* for IFNAMSIZ and co... */ #include <linux/if.h> /* for IFNAMSIZ and co... */
@ -82,7 +80,7 @@
* (there is some stuff that will be added in the future...) * (there is some stuff that will be added in the future...)
* I just plan to increment with each new version. * I just plan to increment with each new version.
*/ */
#define WIRELESS_EXT 18 #define WIRELESS_EXT 19
/* /*
* Changes : * Changes :
@ -197,6 +195,15 @@
* related parameters (extensible up to 4096 parameter values) * related parameters (extensible up to 4096 parameter values)
* - Add wireless events: IWEVGENIE, IWEVMICHAELMICFAILURE, * - Add wireless events: IWEVGENIE, IWEVMICHAELMICFAILURE,
* IWEVASSOCREQIE, IWEVASSOCRESPIE, IWEVPMKIDCAND * IWEVASSOCREQIE, IWEVASSOCRESPIE, IWEVPMKIDCAND
*
* V18 to V19
* ----------
* - Remove (struct iw_point *)->pointer from events and streams
* - Remove header includes to help user space
* - Increase IW_ENCODING_TOKEN_MAX from 32 to 64
* - Add IW_QUAL_ALL_UPDATED and IW_QUAL_ALL_INVALID macros
* - Add explicit flag to tell stats are in dBm : IW_QUAL_DBM
* - Add IW_IOCTL_IDX() and IW_EVENT_IDX() macros
*/ */
/**************************** CONSTANTS ****************************/ /**************************** CONSTANTS ****************************/
@ -322,6 +329,7 @@
/* The first and the last (range) */ /* The first and the last (range) */
#define SIOCIWFIRST 0x8B00 #define SIOCIWFIRST 0x8B00
#define SIOCIWLAST SIOCIWLASTPRIV /* 0x8BFF */ #define SIOCIWLAST SIOCIWLASTPRIV /* 0x8BFF */
#define IW_IOCTL_IDX(cmd) ((cmd) - SIOCIWFIRST)
/* Even : get (world access), odd : set (root access) */ /* Even : get (world access), odd : set (root access) */
#define IW_IS_SET(cmd) (!((cmd) & 0x1)) #define IW_IS_SET(cmd) (!((cmd) & 0x1))
@ -366,6 +374,7 @@
* (struct iw_pmkid_cand) */ * (struct iw_pmkid_cand) */
#define IWEVFIRST 0x8C00 #define IWEVFIRST 0x8C00
#define IW_EVENT_IDX(cmd) ((cmd) - IWEVFIRST)
/* ------------------------- PRIVATE INFO ------------------------- */ /* ------------------------- PRIVATE INFO ------------------------- */
/* /*
@ -427,12 +436,15 @@
#define IW_MODE_MONITOR 6 /* Passive monitor (listen only) */ #define IW_MODE_MONITOR 6 /* Passive monitor (listen only) */
/* Statistics flags (bitmask in updated) */ /* Statistics flags (bitmask in updated) */
#define IW_QUAL_QUAL_UPDATED 0x1 /* Value was updated since last read */ #define IW_QUAL_QUAL_UPDATED 0x01 /* Value was updated since last read */
#define IW_QUAL_LEVEL_UPDATED 0x2 #define IW_QUAL_LEVEL_UPDATED 0x02
#define IW_QUAL_NOISE_UPDATED 0x4 #define IW_QUAL_NOISE_UPDATED 0x04
#define IW_QUAL_ALL_UPDATED 0x07
#define IW_QUAL_DBM 0x08 /* Level + Noise are dBm */
#define IW_QUAL_QUAL_INVALID 0x10 /* Driver doesn't provide value */ #define IW_QUAL_QUAL_INVALID 0x10 /* Driver doesn't provide value */
#define IW_QUAL_LEVEL_INVALID 0x20 #define IW_QUAL_LEVEL_INVALID 0x20
#define IW_QUAL_NOISE_INVALID 0x40 #define IW_QUAL_NOISE_INVALID 0x40
#define IW_QUAL_ALL_INVALID 0x70
/* Frequency flags */ /* Frequency flags */
#define IW_FREQ_AUTO 0x00 /* Let the driver decides */ #define IW_FREQ_AUTO 0x00 /* Let the driver decides */
@ -443,7 +455,7 @@
#define IW_MAX_ENCODING_SIZES 8 #define IW_MAX_ENCODING_SIZES 8
/* Maximum size of the encoding token in bytes */ /* Maximum size of the encoding token in bytes */
#define IW_ENCODING_TOKEN_MAX 32 /* 256 bits (for now) */ #define IW_ENCODING_TOKEN_MAX 64 /* 512 bits (for now) */
/* Flags for encoding (along with the token) */ /* Flags for encoding (along with the token) */
#define IW_ENCODE_INDEX 0x00FF /* Token index (if needed) */ #define IW_ENCODE_INDEX 0x00FF /* Token index (if needed) */
@ -1039,12 +1051,16 @@ struct iw_event
#define IW_EV_CHAR_LEN (IW_EV_LCP_LEN + IFNAMSIZ) #define IW_EV_CHAR_LEN (IW_EV_LCP_LEN + IFNAMSIZ)
#define IW_EV_UINT_LEN (IW_EV_LCP_LEN + sizeof(__u32)) #define IW_EV_UINT_LEN (IW_EV_LCP_LEN + sizeof(__u32))
#define IW_EV_FREQ_LEN (IW_EV_LCP_LEN + sizeof(struct iw_freq)) #define IW_EV_FREQ_LEN (IW_EV_LCP_LEN + sizeof(struct iw_freq))
#define IW_EV_POINT_LEN (IW_EV_LCP_LEN + sizeof(struct iw_point))
#define IW_EV_PARAM_LEN (IW_EV_LCP_LEN + sizeof(struct iw_param)) #define IW_EV_PARAM_LEN (IW_EV_LCP_LEN + sizeof(struct iw_param))
#define IW_EV_ADDR_LEN (IW_EV_LCP_LEN + sizeof(struct sockaddr)) #define IW_EV_ADDR_LEN (IW_EV_LCP_LEN + sizeof(struct sockaddr))
#define IW_EV_QUAL_LEN (IW_EV_LCP_LEN + sizeof(struct iw_quality)) #define IW_EV_QUAL_LEN (IW_EV_LCP_LEN + sizeof(struct iw_quality))
/* Note : in the case of iw_point, the extra data will come at the /* iw_point events are special. First, the payload (extra data) come at
* end of the event */ * the end of the event, so they are bigger than IW_EV_POINT_LEN. Second,
* we omit the pointer, so start at an offset. */
#define IW_EV_POINT_OFF (((char *) &(((struct iw_point *) NULL)->length)) - \
(char *) NULL)
#define IW_EV_POINT_LEN (IW_EV_LCP_LEN + sizeof(struct iw_point) - \
IW_EV_POINT_OFF)
#endif /* _LINUX_WIRELESS_H */ #endif /* _LINUX_WIRELESS_H */

121
include/net/iw_handler.h
View file

@ -1,10 +1,10 @@
/* /*
* This file define the new driver API for Wireless Extensions * This file define the new driver API for Wireless Extensions
* *
* Version : 6 21.6.04 * Version : 7 18.3.05
* *
* Authors : Jean Tourrilhes - HPL - <jt@hpl.hp.com> * Authors : Jean Tourrilhes - HPL - <jt@hpl.hp.com>
* Copyright (c) 2001-2004 Jean Tourrilhes, All Rights Reserved. * Copyright (c) 2001-2005 Jean Tourrilhes, All Rights Reserved.
*/ */
#ifndef _IW_HANDLER_H #ifndef _IW_HANDLER_H
@ -207,7 +207,7 @@
* will be needed... * will be needed...
* I just plan to increment with each new version. * I just plan to increment with each new version.
*/ */
#define IW_HANDLER_VERSION 6 #define IW_HANDLER_VERSION 7
/* /*
* Changes : * Changes :
@ -232,6 +232,13 @@
* - Remove spy #ifdef, they are always on -> cleaner code * - Remove spy #ifdef, they are always on -> cleaner code
* - Add IW_DESCR_FLAG_NOMAX flag for very large requests * - Add IW_DESCR_FLAG_NOMAX flag for very large requests
* - Start migrating get_wireless_stats to struct iw_handler_def * - Start migrating get_wireless_stats to struct iw_handler_def
*
* V6 to V7
* --------
* - Add struct ieee80211_device pointer in struct iw_public_data
* - Remove (struct iw_point *)->pointer from events and streams
* - Remove spy_offset from struct iw_handler_def
* - Add "check" version of event macros for ieee802.11 stack
*/ */
/**************************** CONSTANTS ****************************/ /**************************** CONSTANTS ****************************/
@ -334,9 +341,6 @@ struct iw_handler_def
* We will automatically export that to user space... */ * We will automatically export that to user space... */
const struct iw_priv_args * private_args; const struct iw_priv_args * private_args;
/* This field will be *removed* in the next version of WE */
long spy_offset; /* DO NOT USE */
/* New location of get_wireless_stats, to de-bloat struct net_device. /* New location of get_wireless_stats, to de-bloat struct net_device.
* The old pointer in struct net_device will be gradually phased * The old pointer in struct net_device will be gradually phased
* out, and drivers are encouraged to use this one... */ * out, and drivers are encouraged to use this one... */
@ -400,16 +404,21 @@ struct iw_spy_data
/* --------------------- DEVICE WIRELESS DATA --------------------- */ /* --------------------- DEVICE WIRELESS DATA --------------------- */
/* /*
* This is all the wireless data specific to a device instance that * This is all the wireless data specific to a device instance that
* is managed by the core of Wireless Extensions. * is managed by the core of Wireless Extensions or the 802.11 layer.
* We only keep pointer to those structures, so that a driver is free * We only keep pointer to those structures, so that a driver is free
* to share them between instances. * to share them between instances.
* This structure should be initialised before registering the device. * This structure should be initialised before registering the device.
* Access to this data follow the same rules as any other struct net_device * Access to this data follow the same rules as any other struct net_device
* data (i.e. valid as long as struct net_device exist, same locking rules). * data (i.e. valid as long as struct net_device exist, same locking rules).
*/ */
/* Forward declaration */
struct ieee80211_device;
/* The struct */
struct iw_public_data { struct iw_public_data {
/* Driver enhanced spy support */ /* Driver enhanced spy support */
struct iw_spy_data * spy_data; struct iw_spy_data * spy_data;
/* Structure managed by the in-kernel IEEE 802.11 layer */
struct ieee80211_device * ieee80211;
}; };
/**************************** PROTOTYPES ****************************/ /**************************** PROTOTYPES ****************************/
@ -424,7 +433,7 @@ struct iw_public_data {
extern int dev_get_wireless_info(char * buffer, char **start, off_t offset, extern int dev_get_wireless_info(char * buffer, char **start, off_t offset,
int length); int length);
/* Handle IOCTLs, called in net/code/dev.c */ /* Handle IOCTLs, called in net/core/dev.c */
extern int wireless_process_ioctl(struct ifreq *ifr, unsigned int cmd); extern int wireless_process_ioctl(struct ifreq *ifr, unsigned int cmd);
/* Second : functions that may be called by driver modules */ /* Second : functions that may be called by driver modules */
@ -479,7 +488,7 @@ iwe_stream_add_event(char * stream, /* Stream of events */
int event_len) /* Real size of payload */ int event_len) /* Real size of payload */
{ {
/* Check if it's possible */ /* Check if it's possible */
if((stream + event_len) < ends) { if(likely((stream + event_len) < ends)) {
iwe->len = event_len; iwe->len = event_len;
memcpy(stream, (char *) iwe, event_len); memcpy(stream, (char *) iwe, event_len);
stream += event_len; stream += event_len;
@ -495,14 +504,17 @@ iwe_stream_add_event(char * stream, /* Stream of events */
static inline char * static inline char *
iwe_stream_add_point(char * stream, /* Stream of events */ iwe_stream_add_point(char * stream, /* Stream of events */
char * ends, /* End of stream */ char * ends, /* End of stream */
struct iw_event *iwe, /* Payload */ struct iw_event *iwe, /* Payload length + flags */
char * extra) char * extra) /* More payload */
{ {
int event_len = IW_EV_POINT_LEN + iwe->u.data.length; int event_len = IW_EV_POINT_LEN + iwe->u.data.length;
/* Check if it's possible */ /* Check if it's possible */
if((stream + event_len) < ends) { if(likely((stream + event_len) < ends)) {
iwe->len = event_len; iwe->len = event_len;
memcpy(stream, (char *) iwe, IW_EV_POINT_LEN); memcpy(stream, (char *) iwe, IW_EV_LCP_LEN);
memcpy(stream + IW_EV_LCP_LEN,
((char *) iwe) + IW_EV_LCP_LEN + IW_EV_POINT_OFF,
IW_EV_POINT_LEN - IW_EV_LCP_LEN);
memcpy(stream + IW_EV_POINT_LEN, extra, iwe->u.data.length); memcpy(stream + IW_EV_POINT_LEN, extra, iwe->u.data.length);
stream += event_len; stream += event_len;
} }
@ -526,7 +538,7 @@ iwe_stream_add_value(char * event, /* Event in the stream */
event_len -= IW_EV_LCP_LEN; event_len -= IW_EV_LCP_LEN;
/* Check if it's possible */ /* Check if it's possible */
if((value + event_len) < ends) { if(likely((value + event_len) < ends)) {
/* Add new value */ /* Add new value */
memcpy(value, (char *) iwe + IW_EV_LCP_LEN, event_len); memcpy(value, (char *) iwe + IW_EV_LCP_LEN, event_len);
value += event_len; value += event_len;
@ -537,4 +549,85 @@ iwe_stream_add_value(char * event, /* Event in the stream */
return value; return value;
} }
/*------------------------------------------------------------------*/
/*
* Wrapper to add an Wireless Event to a stream of events.
* Same as above, with explicit error check...
*/
static inline char *
iwe_stream_check_add_event(char * stream, /* Stream of events */
char * ends, /* End of stream */
struct iw_event *iwe, /* Payload */
int event_len, /* Size of payload */
int * perr) /* Error report */
{
/* Check if it's possible, set error if not */
if(likely((stream + event_len) < ends)) {
iwe->len = event_len;
memcpy(stream, (char *) iwe, event_len);
stream += event_len;
} else
*perr = -E2BIG;
return stream;
}
/*------------------------------------------------------------------*/
/*
* Wrapper to add an short Wireless Event containing a pointer to a
* stream of events.
* Same as above, with explicit error check...
*/
static inline char *
iwe_stream_check_add_point(char * stream, /* Stream of events */
char * ends, /* End of stream */
struct iw_event *iwe, /* Payload length + flags */
char * extra, /* More payload */
int * perr) /* Error report */
{
int event_len = IW_EV_POINT_LEN + iwe->u.data.length;
/* Check if it's possible */
if(likely((stream + event_len) < ends)) {
iwe->len = event_len;
memcpy(stream, (char *) iwe, IW_EV_LCP_LEN);
memcpy(stream + IW_EV_LCP_LEN,
((char *) iwe) + IW_EV_LCP_LEN + IW_EV_POINT_OFF,
IW_EV_POINT_LEN - IW_EV_LCP_LEN);
memcpy(stream + IW_EV_POINT_LEN, extra, iwe->u.data.length);
stream += event_len;
} else
*perr = -E2BIG;
return stream;
}
/*------------------------------------------------------------------*/
/*
* Wrapper to add a value to a Wireless Event in a stream of events.
* Be careful, this one is tricky to use properly :
* At the first run, you need to have (value = event + IW_EV_LCP_LEN).
* Same as above, with explicit error check...
*/
static inline char *
iwe_stream_check_add_value(char * event, /* Event in the stream */
char * value, /* Value in event */
char * ends, /* End of stream */
struct iw_event *iwe, /* Payload */
int event_len, /* Size of payload */
int * perr) /* Error report */
{
/* Don't duplicate LCP */
event_len -= IW_EV_LCP_LEN;
/* Check if it's possible */
if(likely((value + event_len) < ends)) {
/* Add new value */
memcpy(value, (char *) iwe + IW_EV_LCP_LEN, event_len);
value += event_len;
/* Patch LCP */
iwe->len = value - event;
memcpy(event, (char *) iwe, IW_EV_LCP_LEN);
} else
*perr = -E2BIG;
return value;
}
#endif /* _IW_HANDLER_H */ #endif /* _IW_HANDLER_H */

58
net/core/wireless.c
View file

@ -58,6 +58,13 @@
* o Add wmb() in iw_handler_set_spy() for non-coherent archs/cpus * o Add wmb() in iw_handler_set_spy() for non-coherent archs/cpus
* Based on patch from Pavel Roskin <proski@gnu.org> : * Based on patch from Pavel Roskin <proski@gnu.org> :
* o Fix kernel data leak to user space in private handler handling * o Fix kernel data leak to user space in private handler handling
*
* v7 - 18.3.05 - Jean II
* o Remove (struct iw_point *)->pointer from events and streams
* o Remove spy_offset from struct iw_handler_def
* o Start deprecating dev->get_wireless_stats, output a warning
* o If IW_QUAL_DBM is set, show dBm values in /proc/net/wireless
* o Don't loose INVALID/DBM flags when clearing UPDATED flags (iwstats)
*/ */
/***************************** INCLUDES *****************************/ /***************************** INCLUDES *****************************/
@ -446,10 +453,14 @@ static inline struct iw_statistics *get_wireless_stats(struct net_device *dev)
(dev->wireless_handlers->get_wireless_stats != NULL)) (dev->wireless_handlers->get_wireless_stats != NULL))
return dev->wireless_handlers->get_wireless_stats(dev); return dev->wireless_handlers->get_wireless_stats(dev);
/* Old location, will be phased out in next WE */ /* Old location, field to be removed in next WE */
return (dev->get_wireless_stats ? if(dev->get_wireless_stats) {
dev->get_wireless_stats(dev) : printk(KERN_DEBUG "%s (WE) : Driver using old /proc/net/wireless support, please fix driver !\n",
(struct iw_statistics *) NULL); dev->name);
return dev->get_wireless_stats(dev);
}
/* Not found */
return (struct iw_statistics *) NULL;
} }
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
@ -541,16 +552,18 @@ static __inline__ void wireless_seq_printf_stats(struct seq_file *seq,
dev->name, stats->status, stats->qual.qual, dev->name, stats->status, stats->qual.qual,
stats->qual.updated & IW_QUAL_QUAL_UPDATED stats->qual.updated & IW_QUAL_QUAL_UPDATED
? '.' : ' ', ? '.' : ' ',
((__u8) stats->qual.level), ((__s32) stats->qual.level) -
((stats->qual.updated & IW_QUAL_DBM) ? 0x100 : 0),
stats->qual.updated & IW_QUAL_LEVEL_UPDATED stats->qual.updated & IW_QUAL_LEVEL_UPDATED
? '.' : ' ', ? '.' : ' ',
((__u8) stats->qual.noise), ((__s32) stats->qual.noise) -
((stats->qual.updated & IW_QUAL_DBM) ? 0x100 : 0),
stats->qual.updated & IW_QUAL_NOISE_UPDATED stats->qual.updated & IW_QUAL_NOISE_UPDATED
? '.' : ' ', ? '.' : ' ',
stats->discard.nwid, stats->discard.code, stats->discard.nwid, stats->discard.code,
stats->discard.fragment, stats->discard.retries, stats->discard.fragment, stats->discard.retries,
stats->discard.misc, stats->miss.beacon); stats->discard.misc, stats->miss.beacon);
stats->qual.updated = 0; stats->qual.updated &= ~IW_QUAL_ALL_UPDATED;
} }
} }
@ -593,6 +606,7 @@ static struct file_operations wireless_seq_fops = {
int __init wireless_proc_init(void) int __init wireless_proc_init(void)
{ {
/* Create /proc/net/wireless entry */
if (!proc_net_fops_create("wireless", S_IRUGO, &wireless_seq_fops)) if (!proc_net_fops_create("wireless", S_IRUGO, &wireless_seq_fops))
return -ENOMEM; return -ENOMEM;
@ -627,9 +641,9 @@ static inline int dev_iwstats(struct net_device *dev, struct ifreq *ifr)
sizeof(struct iw_statistics))) sizeof(struct iw_statistics)))
return -EFAULT; return -EFAULT;
/* Check if we need to clear the update flag */ /* Check if we need to clear the updated flag */
if(wrq->u.data.flags != 0) if(wrq->u.data.flags != 0)
stats->qual.updated = 0; stats->qual.updated &= ~IW_QUAL_ALL_UPDATED;
return 0; return 0;
} else } else
return -EOPNOTSUPP; return -EOPNOTSUPP;
@ -1161,10 +1175,11 @@ void wireless_send_event(struct net_device * dev,
struct iw_event *event; /* Mallocated whole event */ struct iw_event *event; /* Mallocated whole event */
int event_len; /* Its size */ int event_len; /* Its size */
int hdr_len; /* Size of the event header */ int hdr_len; /* Size of the event header */
int wrqu_off = 0; /* Offset in wrqu */
/* Don't "optimise" the following variable, it will crash */ /* Don't "optimise" the following variable, it will crash */
unsigned cmd_index; /* *MUST* be unsigned */ unsigned cmd_index; /* *MUST* be unsigned */
/* Get the description of the IOCTL */ /* Get the description of the Event */
if(cmd <= SIOCIWLAST) { if(cmd <= SIOCIWLAST) {
cmd_index = cmd - SIOCIWFIRST; cmd_index = cmd - SIOCIWFIRST;
if(cmd_index < standard_ioctl_num) if(cmd_index < standard_ioctl_num)
@ -1207,6 +1222,8 @@ void wireless_send_event(struct net_device * dev,
/* Calculate extra_len - extra is NULL for restricted events */ /* Calculate extra_len - extra is NULL for restricted events */
if(extra != NULL) if(extra != NULL)
extra_len = wrqu->data.length * descr->token_size; extra_len = wrqu->data.length * descr->token_size;
/* Always at an offset in wrqu */
wrqu_off = IW_EV_POINT_OFF;
#ifdef WE_EVENT_DEBUG #ifdef WE_EVENT_DEBUG
printk(KERN_DEBUG "%s (WE) : Event 0x%04X, tokens %d, extra_len %d\n", dev->name, cmd, wrqu->data.length, extra_len); printk(KERN_DEBUG "%s (WE) : Event 0x%04X, tokens %d, extra_len %d\n", dev->name, cmd, wrqu->data.length, extra_len);
#endif /* WE_EVENT_DEBUG */ #endif /* WE_EVENT_DEBUG */
@ -1217,7 +1234,7 @@ void wireless_send_event(struct net_device * dev,
event_len = hdr_len + extra_len; event_len = hdr_len + extra_len;
#ifdef WE_EVENT_DEBUG #ifdef WE_EVENT_DEBUG
printk(KERN_DEBUG "%s (WE) : Event 0x%04X, hdr_len %d, event_len %d\n", dev->name, cmd, hdr_len, event_len); printk(KERN_DEBUG "%s (WE) : Event 0x%04X, hdr_len %d, wrqu_off %d, event_len %d\n", dev->name, cmd, hdr_len, wrqu_off, event_len);
#endif /* WE_EVENT_DEBUG */ #endif /* WE_EVENT_DEBUG */
/* Create temporary buffer to hold the event */ /* Create temporary buffer to hold the event */
@ -1228,7 +1245,7 @@ void wireless_send_event(struct net_device * dev,
/* Fill event */ /* Fill event */
event->len = event_len; event->len = event_len;
event->cmd = cmd; event->cmd = cmd;
memcpy(&event->u, wrqu, hdr_len - IW_EV_LCP_LEN); memcpy(&event->u, ((char *) wrqu) + wrqu_off, hdr_len - IW_EV_LCP_LEN);
if(extra != NULL) if(extra != NULL)
memcpy(((char *) event) + hdr_len, extra, extra_len); memcpy(((char *) event) + hdr_len, extra, extra_len);
@ -1249,7 +1266,7 @@ void wireless_send_event(struct net_device * dev,
* Now, the driver can delegate this task to Wireless Extensions. * Now, the driver can delegate this task to Wireless Extensions.
* It needs to use those standard spy iw_handler in struct iw_handler_def, * It needs to use those standard spy iw_handler in struct iw_handler_def,
* push data to us via wireless_spy_update() and include struct iw_spy_data * push data to us via wireless_spy_update() and include struct iw_spy_data
* in its private part (and advertise it in iw_handler_def->spy_offset). * in its private part (and export it in net_device->wireless_data->spy_data).
* One of the main advantage of centralising spy support here is that * One of the main advantage of centralising spy support here is that
* it becomes much easier to improve and extend it without having to touch * it becomes much easier to improve and extend it without having to touch
* the drivers. One example is the addition of the Spy-Threshold events. * the drivers. One example is the addition of the Spy-Threshold events.
@ -1266,10 +1283,7 @@ static inline struct iw_spy_data * get_spydata(struct net_device *dev)
/* This is the new way */ /* This is the new way */
if(dev->wireless_data) if(dev->wireless_data)
return(dev->wireless_data->spy_data); return(dev->wireless_data->spy_data);
return NULL;
/* This is the old way. Doesn't work for multi-headed drivers.
* It will be removed in the next version of WE. */
return (dev->priv + dev->wireless_handlers->spy_offset);
} }
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
@ -1284,10 +1298,6 @@ int iw_handler_set_spy(struct net_device * dev,
struct iw_spy_data * spydata = get_spydata(dev); struct iw_spy_data * spydata = get_spydata(dev);
struct sockaddr * address = (struct sockaddr *) extra; struct sockaddr * address = (struct sockaddr *) extra;
if(!dev->wireless_data)
/* Help user know that driver needs updating */
printk(KERN_DEBUG "%s (WE) : Driver using old/buggy spy support, please fix driver !\n",
dev->name);
/* Make sure driver is not buggy or using the old API */ /* Make sure driver is not buggy or using the old API */
if(!spydata) if(!spydata)
return -EOPNOTSUPP; return -EOPNOTSUPP;
@ -1318,7 +1328,7 @@ int iw_handler_set_spy(struct net_device * dev,
sizeof(struct iw_quality) * IW_MAX_SPY); sizeof(struct iw_quality) * IW_MAX_SPY);
#ifdef WE_SPY_DEBUG #ifdef WE_SPY_DEBUG
printk(KERN_DEBUG "iw_handler_set_spy() : offset %ld, spydata %p, num %d\n", dev->wireless_handlers->spy_offset, spydata, wrqu->data.length); printk(KERN_DEBUG "iw_handler_set_spy() : wireless_data %p, spydata %p, num %d\n", dev->wireless_data, spydata, wrqu->data.length);
for (i = 0; i < wrqu->data.length; i++) for (i = 0; i < wrqu->data.length; i++)
printk(KERN_DEBUG printk(KERN_DEBUG
"%02X:%02X:%02X:%02X:%02X:%02X \n", "%02X:%02X:%02X:%02X:%02X:%02X \n",
@ -1371,7 +1381,7 @@ int iw_handler_get_spy(struct net_device * dev,
sizeof(struct iw_quality) * spydata->spy_number); sizeof(struct iw_quality) * spydata->spy_number);
/* Reset updated flags. */ /* Reset updated flags. */
for(i = 0; i < spydata->spy_number; i++) for(i = 0; i < spydata->spy_number; i++)
spydata->spy_stat[i].updated = 0; spydata->spy_stat[i].updated &= ~IW_QUAL_ALL_UPDATED;
return 0; return 0;
} }
@ -1486,7 +1496,7 @@ void wireless_spy_update(struct net_device * dev,
return; return;
#ifdef WE_SPY_DEBUG #ifdef WE_SPY_DEBUG
printk(KERN_DEBUG "wireless_spy_update() : offset %ld, spydata %p, address %02X:%02X:%02X:%02X:%02X:%02X\n", dev->wireless_handlers->spy_offset, spydata, address[0], address[1], address[2], address[3], address[4], address[5]); printk(KERN_DEBUG "wireless_spy_update() : wireless_data %p, spydata %p, address %02X:%02X:%02X:%02X:%02X:%02X\n", dev->wireless_data, spydata, address[0], address[1], address[2], address[3], address[4], address[5]);
#endif /* WE_SPY_DEBUG */ #endif /* WE_SPY_DEBUG */
/* Update all records that match */ /* Update all records that match */

17
net/ieee80211/ieee80211_crypt.c
View file

@ -30,7 +30,6 @@ struct ieee80211_crypto_alg {
struct ieee80211_crypto_ops *ops; struct ieee80211_crypto_ops *ops;
}; };
struct ieee80211_crypto { struct ieee80211_crypto {
struct list_head algs; struct list_head algs;
spinlock_t lock; spinlock_t lock;
@ -38,8 +37,7 @@ struct ieee80211_crypto {
static struct ieee80211_crypto *hcrypt; static struct ieee80211_crypto *hcrypt;
void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee, void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee, int force)
int force)
{ {
struct list_head *ptr, *n; struct list_head *ptr, *n;
struct ieee80211_crypt_data *entry; struct ieee80211_crypt_data *entry;
@ -158,7 +156,6 @@ int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
return del_alg ? 0 : -1; return del_alg ? 0 : -1;
} }
struct ieee80211_crypto_ops *ieee80211_get_crypto_ops(const char *name) struct ieee80211_crypto_ops *ieee80211_get_crypto_ops(const char *name)
{ {
unsigned long flags; unsigned long flags;
@ -185,9 +182,13 @@ struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name)
return NULL; return NULL;
} }
static void *ieee80211_crypt_null_init(int keyidx)
static void * ieee80211_crypt_null_init(int keyidx) { return (void *) 1; } {
static void ieee80211_crypt_null_deinit(void *priv) {} return (void *)1;
}
static void ieee80211_crypt_null_deinit(void *priv)
{
}
static struct ieee80211_crypto_ops ieee80211_crypt_null = { static struct ieee80211_crypto_ops ieee80211_crypt_null = {
.name = "NULL", .name = "NULL",
@ -204,7 +205,6 @@ static struct ieee80211_crypto_ops ieee80211_crypt_null = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int __init ieee80211_crypto_init(void) static int __init ieee80211_crypto_init(void)
{ {
int ret = -ENOMEM; int ret = -ENOMEM;
@ -226,7 +226,6 @@ out:
return ret; return ret;
} }
static void __exit ieee80211_crypto_deinit(void) static void __exit ieee80211_crypto_deinit(void)
{ {
struct list_head *ptr, *n; struct list_head *ptr, *n;

19
net/ieee80211/ieee80211_crypt_ccmp.c
View file

@ -24,7 +24,6 @@
#include <net/ieee80211.h> #include <net/ieee80211.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <asm/scatterlist.h> #include <asm/scatterlist.h>
@ -104,7 +103,6 @@ fail:
return NULL; return NULL;
} }
static void ieee80211_ccmp_deinit(void *priv) static void ieee80211_ccmp_deinit(void *priv)
{ {
struct ieee80211_ccmp_data *_priv = priv; struct ieee80211_ccmp_data *_priv = priv;
@ -113,7 +111,6 @@ static void ieee80211_ccmp_deinit(void *priv)
kfree(priv); kfree(priv);
} }
static inline void xor_block(u8 * b, u8 * a, size_t len) static inline void xor_block(u8 * b, u8 * a, size_t len)
{ {
int i; int i;
@ -121,11 +118,9 @@ static inline void xor_block(u8 *b, u8 *a, size_t len)
b[i] ^= a[i]; b[i] ^= a[i];
} }
static void ccmp_init_blocks(struct crypto_tfm *tfm, static void ccmp_init_blocks(struct crypto_tfm *tfm,
struct ieee80211_hdr *hdr, struct ieee80211_hdr *hdr,
u8 *pn, size_t dlen, u8 *b0, u8 *auth, u8 * pn, size_t dlen, u8 * b0, u8 * auth, u8 * s0)
u8 *s0)
{ {
u8 *pos, qc = 0; u8 *pos, qc = 0;
size_t aad_len; size_t aad_len;
@ -196,7 +191,6 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,
ieee80211_ccmp_aes_encrypt(tfm, b0, s0); ieee80211_ccmp_aes_encrypt(tfm, b0, s0);
} }
static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
{ {
struct ieee80211_ccmp_data *key = priv; struct ieee80211_ccmp_data *key = priv;
@ -209,8 +203,7 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
u8 *s0 = key->tx_s0; u8 *s0 = key->tx_s0;
if (skb_headroom(skb) < CCMP_HDR_LEN || if (skb_headroom(skb) < CCMP_HDR_LEN ||
skb_tailroom(skb) < CCMP_MIC_LEN || skb_tailroom(skb) < CCMP_MIC_LEN || skb->len < hdr_len)
skb->len < hdr_len)
return -1; return -1;
data_len = skb->len - hdr_len; data_len = skb->len - hdr_len;
@ -261,7 +254,6 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
return 0; return 0;
} }
static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
{ {
struct ieee80211_ccmp_data *key = priv; struct ieee80211_ccmp_data *key = priv;
@ -364,7 +356,6 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
return keyidx; return keyidx;
} }
static int ieee80211_ccmp_set_key(void *key, int len, u8 * seq, void *priv) static int ieee80211_ccmp_set_key(void *key, int len, u8 * seq, void *priv)
{ {
struct ieee80211_ccmp_data *data = priv; struct ieee80211_ccmp_data *data = priv;
@ -395,7 +386,6 @@ static int ieee80211_ccmp_set_key(void *key, int len, u8 *seq, void *priv)
return 0; return 0;
} }
static int ieee80211_ccmp_get_key(void *key, int len, u8 * seq, void *priv) static int ieee80211_ccmp_get_key(void *key, int len, u8 * seq, void *priv)
{ {
struct ieee80211_ccmp_data *data = priv; struct ieee80211_ccmp_data *data = priv;
@ -419,7 +409,6 @@ static int ieee80211_ccmp_get_key(void *key, int len, u8 *seq, void *priv)
return CCMP_TK_LEN; return CCMP_TK_LEN;
} }
static char *ieee80211_ccmp_print_stats(char *p, void *priv) static char *ieee80211_ccmp_print_stats(char *p, void *priv)
{ {
struct ieee80211_ccmp_data *ccmp = priv; struct ieee80211_ccmp_data *ccmp = priv;
@ -436,7 +425,6 @@ static char * ieee80211_ccmp_print_stats(char *p, void *priv)
return p; return p;
} }
static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = { static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = {
.name = "CCMP", .name = "CCMP",
.init = ieee80211_ccmp_init, .init = ieee80211_ccmp_init,
@ -453,18 +441,15 @@ static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int __init ieee80211_crypto_ccmp_init(void) static int __init ieee80211_crypto_ccmp_init(void)
{ {
return ieee80211_register_crypto_ops(&ieee80211_crypt_ccmp); return ieee80211_register_crypto_ops(&ieee80211_crypt_ccmp);
} }
static void __exit ieee80211_crypto_ccmp_exit(void) static void __exit ieee80211_crypto_ccmp_exit(void)
{ {
ieee80211_unregister_crypto_ops(&ieee80211_crypt_ccmp); ieee80211_unregister_crypto_ops(&ieee80211_crypt_ccmp);
} }
module_init(ieee80211_crypto_ccmp_init); module_init(ieee80211_crypto_ccmp_init);
module_exit(ieee80211_crypto_ccmp_exit); module_exit(ieee80211_crypto_ccmp_exit);

39
net/ieee80211/ieee80211_crypt_tkip.c
View file

@ -23,7 +23,6 @@
#include <net/ieee80211.h> #include <net/ieee80211.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <asm/scatterlist.h> #include <asm/scatterlist.h>
#include <linux/crc32.h> #include <linux/crc32.h>
@ -100,7 +99,6 @@ fail:
return NULL; return NULL;
} }
static void ieee80211_tkip_deinit(void *priv) static void ieee80211_tkip_deinit(void *priv)
{ {
struct ieee80211_tkip_data *_priv = priv; struct ieee80211_tkip_data *_priv = priv;
@ -111,51 +109,42 @@ static void ieee80211_tkip_deinit(void *priv)
kfree(priv); kfree(priv);
} }
static inline u16 RotR1(u16 val) static inline u16 RotR1(u16 val)
{ {
return (val >> 1) | (val << 15); return (val >> 1) | (val << 15);
} }
static inline u8 Lo8(u16 val) static inline u8 Lo8(u16 val)
{ {
return val & 0xff; return val & 0xff;
} }
static inline u8 Hi8(u16 val) static inline u8 Hi8(u16 val)
{ {
return val >> 8; return val >> 8;
} }
static inline u16 Lo16(u32 val) static inline u16 Lo16(u32 val)
{ {
return val & 0xffff; return val & 0xffff;
} }
static inline u16 Hi16(u32 val) static inline u16 Hi16(u32 val)
{ {
return val >> 16; return val >> 16;
} }
static inline u16 Mk16(u8 hi, u8 lo) static inline u16 Mk16(u8 hi, u8 lo)
{ {
return lo | (((u16) hi) << 8); return lo | (((u16) hi) << 8);
} }
static inline u16 Mk16_le(u16 * v) static inline u16 Mk16_le(u16 * v)
{ {
return le16_to_cpu(*v); return le16_to_cpu(*v);
} }
static const u16 Sbox[256] = {
static const u16 Sbox[256] =
{
0xC6A5, 0xF884, 0xEE99, 0xF68D, 0xFF0D, 0xD6BD, 0xDEB1, 0x9154, 0xC6A5, 0xF884, 0xEE99, 0xF68D, 0xFF0D, 0xD6BD, 0xDEB1, 0x9154,
0x6050, 0x0203, 0xCEA9, 0x567D, 0xE719, 0xB562, 0x4DE6, 0xEC9A, 0x6050, 0x0203, 0xCEA9, 0x567D, 0xE719, 0xB562, 0x4DE6, 0xEC9A,
0x8F45, 0x1F9D, 0x8940, 0xFA87, 0xEF15, 0xB2EB, 0x8EC9, 0xFB0B, 0x8F45, 0x1F9D, 0x8940, 0xFA87, 0xEF15, 0xB2EB, 0x8EC9, 0xFB0B,
@ -190,17 +179,16 @@ static const u16 Sbox[256] =
0x82C3, 0x29B0, 0x5A77, 0x1E11, 0x7BCB, 0xA8FC, 0x6DD6, 0x2C3A, 0x82C3, 0x29B0, 0x5A77, 0x1E11, 0x7BCB, 0xA8FC, 0x6DD6, 0x2C3A,
}; };
static inline u16 _S_(u16 v) static inline u16 _S_(u16 v)
{ {
u16 t = Sbox[Hi8(v)]; u16 t = Sbox[Hi8(v)];
return Sbox[Lo8(v)] ^ ((t << 8) | (t >> 8)); return Sbox[Lo8(v)] ^ ((t << 8) | (t >> 8));
} }
#define PHASE1_LOOP_COUNT 8 #define PHASE1_LOOP_COUNT 8
static void tkip_mixing_phase1(u16 *TTAK, const u8 *TK, const u8 *TA, u32 IV32) static void tkip_mixing_phase1(u16 * TTAK, const u8 * TK, const u8 * TA,
u32 IV32)
{ {
int i, j; int i, j;
@ -221,7 +209,6 @@ static void tkip_mixing_phase1(u16 *TTAK, const u8 *TK, const u8 *TA, u32 IV32)
} }
} }
static void tkip_mixing_phase2(u8 * WEPSeed, const u8 * TK, const u16 * TTAK, static void tkip_mixing_phase2(u8 * WEPSeed, const u8 * TK, const u16 * TTAK,
u16 IV16) u16 IV16)
{ {
@ -427,7 +414,6 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
return keyidx; return keyidx;
} }
static int michael_mic(struct ieee80211_tkip_data *tkey, u8 * key, u8 * hdr, static int michael_mic(struct ieee80211_tkip_data *tkey, u8 * key, u8 * hdr,
u8 * data, size_t data_len, u8 * mic) u8 * data, size_t data_len, u8 * mic)
{ {
@ -482,8 +468,8 @@ static void michael_mic_hdr(struct sk_buff *skb, u8 *hdr)
hdr[13] = hdr[14] = hdr[15] = 0; /* reserved */ hdr[13] = hdr[14] = hdr[15] = 0; /* reserved */
} }
static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len,
static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *priv) void *priv)
{ {
struct ieee80211_tkip_data *tkey = priv; struct ieee80211_tkip_data *tkey = priv;
u8 *pos; u8 *pos;
@ -504,11 +490,9 @@ static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *pri
return 0; return 0;
} }
#if WIRELESS_EXT >= 18 #if WIRELESS_EXT >= 18
static void ieee80211_michael_mic_failure(struct net_device *dev, static void ieee80211_michael_mic_failure(struct net_device *dev,
struct ieee80211_hdr *hdr, struct ieee80211_hdr *hdr, int keyidx)
int keyidx)
{ {
union iwreq_data wrqu; union iwreq_data wrqu;
struct iw_michaelmicfailure ev; struct iw_michaelmicfailure ev;
@ -528,8 +512,7 @@ static void ieee80211_michael_mic_failure(struct net_device *dev,
} }
#elif WIRELESS_EXT >= 15 #elif WIRELESS_EXT >= 15
static void ieee80211_michael_mic_failure(struct net_device *dev, static void ieee80211_michael_mic_failure(struct net_device *dev,
struct ieee80211_hdr *hdr, struct ieee80211_hdr *hdr, int keyidx)
int keyidx)
{ {
union iwreq_data wrqu; union iwreq_data wrqu;
char buf[128]; char buf[128];
@ -550,7 +533,6 @@ static inline void ieee80211_michael_mic_failure(struct net_device *dev,
} }
#endif /* WIRELESS_EXT >= 15 */ #endif /* WIRELESS_EXT >= 15 */
static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx, static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
int hdr_len, void *priv) int hdr_len, void *priv)
{ {
@ -587,7 +569,6 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
return 0; return 0;
} }
static int ieee80211_tkip_set_key(void *key, int len, u8 * seq, void *priv) static int ieee80211_tkip_set_key(void *key, int len, u8 * seq, void *priv)
{ {
struct ieee80211_tkip_data *tkey = priv; struct ieee80211_tkip_data *tkey = priv;
@ -617,7 +598,6 @@ static int ieee80211_tkip_set_key(void *key, int len, u8 *seq, void *priv)
return 0; return 0;
} }
static int ieee80211_tkip_get_key(void *key, int len, u8 * seq, void *priv) static int ieee80211_tkip_get_key(void *key, int len, u8 * seq, void *priv)
{ {
struct ieee80211_tkip_data *tkey = priv; struct ieee80211_tkip_data *tkey = priv;
@ -647,7 +627,6 @@ static int ieee80211_tkip_get_key(void *key, int len, u8 *seq, void *priv)
return TKIP_KEY_LEN; return TKIP_KEY_LEN;
} }
static char *ieee80211_tkip_print_stats(char *p, void *priv) static char *ieee80211_tkip_print_stats(char *p, void *priv)
{ {
struct ieee80211_tkip_data *tkip = priv; struct ieee80211_tkip_data *tkip = priv;
@ -674,7 +653,6 @@ static char * ieee80211_tkip_print_stats(char *p, void *priv)
return p; return p;
} }
static struct ieee80211_crypto_ops ieee80211_crypt_tkip = { static struct ieee80211_crypto_ops ieee80211_crypt_tkip = {
.name = "TKIP", .name = "TKIP",
.init = ieee80211_tkip_init, .init = ieee80211_tkip_init,
@ -691,18 +669,15 @@ static struct ieee80211_crypto_ops ieee80211_crypt_tkip = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int __init ieee80211_crypto_tkip_init(void) static int __init ieee80211_crypto_tkip_init(void)
{ {
return ieee80211_register_crypto_ops(&ieee80211_crypt_tkip); return ieee80211_register_crypto_ops(&ieee80211_crypt_tkip);
} }
static void __exit ieee80211_crypto_tkip_exit(void) static void __exit ieee80211_crypto_tkip_exit(void)
{ {
ieee80211_unregister_crypto_ops(&ieee80211_crypt_tkip); ieee80211_unregister_crypto_ops(&ieee80211_crypt_tkip);
} }
module_init(ieee80211_crypto_tkip_init); module_init(ieee80211_crypto_tkip_init);
module_exit(ieee80211_crypto_tkip_exit); module_exit(ieee80211_crypto_tkip_exit);

16
net/ieee80211/ieee80211_crypt_wep.c
View file

@ -20,7 +20,6 @@
#include <net/ieee80211.h> #include <net/ieee80211.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <asm/scatterlist.h> #include <asm/scatterlist.h>
#include <linux/crc32.h> #include <linux/crc32.h>
@ -29,7 +28,6 @@ MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("Host AP crypt: WEP"); MODULE_DESCRIPTION("Host AP crypt: WEP");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
struct prism2_wep_data { struct prism2_wep_data {
u32 iv; u32 iv;
#define WEP_KEY_LEN 13 #define WEP_KEY_LEN 13
@ -39,7 +37,6 @@ struct prism2_wep_data {
struct crypto_tfm *tfm; struct crypto_tfm *tfm;
}; };
static void *prism2_wep_init(int keyidx) static void *prism2_wep_init(int keyidx)
{ {
struct prism2_wep_data *priv; struct prism2_wep_data *priv;
@ -71,7 +68,6 @@ fail:
return NULL; return NULL;
} }
static void prism2_wep_deinit(void *priv) static void prism2_wep_deinit(void *priv)
{ {
struct prism2_wep_data *_priv = priv; struct prism2_wep_data *_priv = priv;
@ -80,7 +76,6 @@ static void prism2_wep_deinit(void *priv)
kfree(priv); kfree(priv);
} }
/* Perform WEP encryption on given skb that has at least 4 bytes of headroom /* Perform WEP encryption on given skb that has at least 4 bytes of headroom
* for IV and 4 bytes of tailroom for ICV. Both IV and ICV will be transmitted, * for IV and 4 bytes of tailroom for ICV. Both IV and ICV will be transmitted,
* so the payload length increases with 8 bytes. * so the payload length increases with 8 bytes.
@ -143,7 +138,6 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
return 0; return 0;
} }
/* Perform WEP decryption on given buffer. Buffer includes whole WEP part of /* Perform WEP decryption on given buffer. Buffer includes whole WEP part of
* the frame: IV (4 bytes), encrypted payload (including SNAP header), * the frame: IV (4 bytes), encrypted payload (including SNAP header),
* ICV (4 bytes). len includes both IV and ICV. * ICV (4 bytes). len includes both IV and ICV.
@ -202,7 +196,6 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
return 0; return 0;
} }
static int prism2_wep_set_key(void *key, int len, u8 * seq, void *priv) static int prism2_wep_set_key(void *key, int len, u8 * seq, void *priv)
{ {
struct prism2_wep_data *wep = priv; struct prism2_wep_data *wep = priv;
@ -216,7 +209,6 @@ static int prism2_wep_set_key(void *key, int len, u8 *seq, void *priv)
return 0; return 0;
} }
static int prism2_wep_get_key(void *key, int len, u8 * seq, void *priv) static int prism2_wep_get_key(void *key, int len, u8 * seq, void *priv)
{ {
struct prism2_wep_data *wep = priv; struct prism2_wep_data *wep = priv;
@ -229,16 +221,13 @@ static int prism2_wep_get_key(void *key, int len, u8 *seq, void *priv)
return wep->key_len; return wep->key_len;
} }
static char *prism2_wep_print_stats(char *p, void *priv) static char *prism2_wep_print_stats(char *p, void *priv)
{ {
struct prism2_wep_data *wep = priv; struct prism2_wep_data *wep = priv;
p += sprintf(p, "key[%d] alg=WEP len=%d\n", p += sprintf(p, "key[%d] alg=WEP len=%d\n", wep->key_idx, wep->key_len);
wep->key_idx, wep->key_len);
return p; return p;
} }
static struct ieee80211_crypto_ops ieee80211_crypt_wep = { static struct ieee80211_crypto_ops ieee80211_crypt_wep = {
.name = "WEP", .name = "WEP",
.init = prism2_wep_init, .init = prism2_wep_init,
@ -255,18 +244,15 @@ static struct ieee80211_crypto_ops ieee80211_crypt_wep = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int __init ieee80211_crypto_wep_init(void) static int __init ieee80211_crypto_wep_init(void)
{ {
return ieee80211_register_crypto_ops(&ieee80211_crypt_wep); return ieee80211_register_crypto_ops(&ieee80211_crypt_wep);
} }
static void __exit ieee80211_crypto_wep_exit(void) static void __exit ieee80211_crypto_wep_exit(void)
{ {
ieee80211_unregister_crypto_ops(&ieee80211_crypt_wep); ieee80211_unregister_crypto_ops(&ieee80211_crypt_wep);
} }
module_init(ieee80211_crypto_wep_init); module_init(ieee80211_crypto_wep_init);
module_exit(ieee80211_crypto_wep_exit); module_exit(ieee80211_crypto_wep_exit);

20
net/ieee80211/ieee80211_module.c
View file

@ -54,7 +54,8 @@
#include <net/ieee80211.h> #include <net/ieee80211.h>
MODULE_DESCRIPTION("802.11 data/management/control stack"); MODULE_DESCRIPTION("802.11 data/management/control stack");
MODULE_AUTHOR("Copyright (C) 2004 Intel Corporation <jketreno@linux.intel.com>"); MODULE_AUTHOR
("Copyright (C) 2004 Intel Corporation <jketreno@linux.intel.com>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#define DRV_NAME "ieee80211" #define DRV_NAME "ieee80211"
@ -64,8 +65,8 @@ static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee)
if (ieee->networks) if (ieee->networks)
return 0; return 0;
ieee->networks = kmalloc( ieee->networks =
MAX_NETWORK_COUNT * sizeof(struct ieee80211_network), kmalloc(MAX_NETWORK_COUNT * sizeof(struct ieee80211_network),
GFP_KERNEL); GFP_KERNEL);
if (!ieee->networks) { if (!ieee->networks) {
printk(KERN_WARNING "%s: Out of memory allocating beacons\n", printk(KERN_WARNING "%s: Out of memory allocating beacons\n",
@ -94,10 +95,10 @@ static inline void ieee80211_networks_initialize(struct ieee80211_device *ieee)
INIT_LIST_HEAD(&ieee->network_free_list); INIT_LIST_HEAD(&ieee->network_free_list);
INIT_LIST_HEAD(&ieee->network_list); INIT_LIST_HEAD(&ieee->network_list);
for (i = 0; i < MAX_NETWORK_COUNT; i++) for (i = 0; i < MAX_NETWORK_COUNT; i++)
list_add_tail(&ieee->networks[i].list, &ieee->network_free_list); list_add_tail(&ieee->networks[i].list,
&ieee->network_free_list);
} }
struct net_device *alloc_ieee80211(int sizeof_priv) struct net_device *alloc_ieee80211(int sizeof_priv)
{ {
struct ieee80211_device *ieee; struct ieee80211_device *ieee;
@ -118,8 +119,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
err = ieee80211_networks_allocate(ieee); err = ieee80211_networks_allocate(ieee);
if (err) { if (err) {
IEEE80211_ERROR("Unable to allocate beacon storage: %d\n", IEEE80211_ERROR("Unable to allocate beacon storage: %d\n", err);
err);
goto failed; goto failed;
} }
ieee80211_networks_initialize(ieee); ieee80211_networks_initialize(ieee);
@ -155,7 +155,6 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
return NULL; return NULL;
} }
void free_ieee80211(struct net_device *dev) void free_ieee80211(struct net_device *dev)
{ {
struct ieee80211_device *ieee = netdev_priv(dev); struct ieee80211_device *ieee = netdev_priv(dev);
@ -264,13 +263,12 @@ static void __exit ieee80211_exit(void)
module_param(debug, int, 0444); module_param(debug, int, 0444);
MODULE_PARM_DESC(debug, "debug output mask"); MODULE_PARM_DESC(debug, "debug output mask");
module_exit(ieee80211_exit); module_exit(ieee80211_exit);
module_init(ieee80211_init); module_init(ieee80211_init);
#endif #endif
const char *escape_essid(const char *essid, u8 essid_len)
const char *escape_essid(const char *essid, u8 essid_len) { {
static char escaped[IW_ESSID_MAX_SIZE * 2 + 1]; static char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
const char *s = essid; const char *s = essid;
char *d = escaped; char *d = escaped;

162
net/ieee80211/ieee80211_rx.c
View file

@ -52,11 +52,14 @@ static inline void ieee80211_monitor_rx(struct ieee80211_device *ieee,
netif_rx(skb); netif_rx(skb);
} }
/* Called only as a tasklet (software IRQ) */ /* Called only as a tasklet (software IRQ) */
static struct ieee80211_frag_entry * static struct ieee80211_frag_entry *ieee80211_frag_cache_find(struct
ieee80211_frag_cache_find(struct ieee80211_device *ieee, unsigned int seq, ieee80211_device
unsigned int frag, u8 *src, u8 *dst) *ieee,
unsigned int seq,
unsigned int frag,
u8 * src,
u8 * dst)
{ {
struct ieee80211_frag_entry *entry; struct ieee80211_frag_entry *entry;
int i; int i;
@ -65,8 +68,7 @@ ieee80211_frag_cache_find(struct ieee80211_device *ieee, unsigned int seq,
entry = &ieee->frag_cache[i]; entry = &ieee->frag_cache[i];
if (entry->skb != NULL && if (entry->skb != NULL &&
time_after(jiffies, entry->first_frag_time + 2 * HZ)) { time_after(jiffies, entry->first_frag_time + 2 * HZ)) {
IEEE80211_DEBUG_FRAG( IEEE80211_DEBUG_FRAG("expiring fragment cache entry "
"expiring fragment cache entry "
"seq=%u last_frag=%u\n", "seq=%u last_frag=%u\n",
entry->seq, entry->last_frag); entry->seq, entry->last_frag);
dev_kfree_skb_any(entry->skb); dev_kfree_skb_any(entry->skb);
@ -84,8 +86,7 @@ ieee80211_frag_cache_find(struct ieee80211_device *ieee, unsigned int seq,
} }
/* Called only as a tasklet (software IRQ) */ /* Called only as a tasklet (software IRQ) */
static struct sk_buff * static struct sk_buff *ieee80211_frag_cache_get(struct ieee80211_device *ieee,
ieee80211_frag_cache_get(struct ieee80211_device *ieee,
struct ieee80211_hdr *hdr) struct ieee80211_hdr *hdr)
{ {
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
@ -135,7 +136,6 @@ ieee80211_frag_cache_get(struct ieee80211_device *ieee,
return skb; return skb;
} }
/* Called only as a tasklet (software IRQ) */ /* Called only as a tasklet (software IRQ) */
static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee, static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee,
struct ieee80211_hdr *hdr) struct ieee80211_hdr *hdr)
@ -151,8 +151,7 @@ static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee,
hdr->addr1); hdr->addr1);
if (entry == NULL) { if (entry == NULL) {
IEEE80211_DEBUG_FRAG( IEEE80211_DEBUG_FRAG("could not invalidate fragment cache "
"could not invalidate fragment cache "
"entry (seq=%u)\n", seq); "entry (seq=%u)\n", seq);
return -1; return -1;
} }
@ -161,7 +160,6 @@ static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee,
return 0; return 0;
} }
#ifdef NOT_YET #ifdef NOT_YET
/* ieee80211_rx_frame_mgtmt /* ieee80211_rx_frame_mgtmt
* *
@ -219,11 +217,10 @@ ieee80211_rx_frame_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb,
} }
#endif #endif
/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */ /* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */
/* Ethernet-II snap header (RFC1042 for most EtherTypes) */ /* Ethernet-II snap header (RFC1042 for most EtherTypes) */
static unsigned char rfc1042_header[] = static unsigned char rfc1042_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */ /* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
static unsigned char bridge_tunnel_header[] = static unsigned char bridge_tunnel_header[] =
{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 }; { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
@ -284,8 +281,7 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb,
hdrlen = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl)); hdrlen = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
#ifdef CONFIG_IEEE80211_CRYPT_TKIP #ifdef CONFIG_IEEE80211_CRYPT_TKIP
if (ieee->tkip_countermeasures && if (ieee->tkip_countermeasures && strcmp(crypt->ops->name, "TKIP") == 0) {
strcmp(crypt->ops->name, "TKIP") == 0) {
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_DEBUG "%s: TKIP countermeasures: dropped " printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
"received packet from " MAC_FMT "\n", "received packet from " MAC_FMT "\n",
@ -299,8 +295,7 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb,
res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv); res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv);
atomic_dec(&crypt->refcnt); atomic_dec(&crypt->refcnt);
if (res < 0) { if (res < 0) {
IEEE80211_DEBUG_DROP( IEEE80211_DEBUG_DROP("decryption failed (SA=" MAC_FMT
"decryption failed (SA=" MAC_FMT
") res=%d\n", MAC_ARG(hdr->addr2), res); ") res=%d\n", MAC_ARG(hdr->addr2), res);
if (res == -2) if (res == -2)
IEEE80211_DEBUG_DROP("Decryption failed ICV " IEEE80211_DEBUG_DROP("Decryption failed ICV "
@ -313,11 +308,11 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb,
return res; return res;
} }
/* Called only as a tasklet (software IRQ), by ieee80211_rx */ /* Called only as a tasklet (software IRQ), by ieee80211_rx */
static inline int static inline int
ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device* ieee, struct sk_buff *skb, ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee,
int keyidx, struct ieee80211_crypt_data *crypt) struct sk_buff *skb, int keyidx,
struct ieee80211_crypt_data *crypt)
{ {
struct ieee80211_hdr *hdr; struct ieee80211_hdr *hdr;
int res, hdrlen; int res, hdrlen;
@ -341,7 +336,6 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device* ieee, struct sk_buff *s
return 0; return 0;
} }
/* All received frames are sent to this function. @skb contains the frame in /* All received frames are sent to this function. @skb contains the frame in
* IEEE 802.11 format, i.e., in the format it was sent over air. * IEEE 802.11 format, i.e., in the format it was sent over air.
* This function is called only as a tasklet (software IRQ). */ * This function is called only as a tasklet (software IRQ). */
@ -373,8 +367,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
stats = &ieee->stats; stats = &ieee->stats;
if (skb->len < 10) { if (skb->len < 10) {
printk(KERN_INFO "%s: SKB length < 10\n", printk(KERN_INFO "%s: SKB length < 10\n", dev->name);
dev->name);
goto rx_dropped; goto rx_dropped;
} }
@ -451,13 +444,11 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
goto rx_dropped; goto rx_dropped;
} }
} }
#ifdef NOT_YET #ifdef NOT_YET
if (type != WLAN_FC_TYPE_DATA) { if (type != WLAN_FC_TYPE_DATA) {
if (type == WLAN_FC_TYPE_MGMT && stype == WLAN_FC_STYPE_AUTH && if (type == WLAN_FC_TYPE_MGMT && stype == WLAN_FC_STYPE_AUTH &&
fc & IEEE80211_FCTL_PROTECTED && ieee->host_decrypt && fc & IEEE80211_FCTL_PROTECTED && ieee->host_decrypt &&
(keyidx = hostap_rx_frame_decrypt(ieee, skb, crypt)) < 0) (keyidx = hostap_rx_frame_decrypt(ieee, skb, crypt)) < 0) {
{
printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth " printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth "
"from " MAC_FMT "\n", dev->name, "from " MAC_FMT "\n", dev->name,
MAC_ARG(hdr->addr2)); MAC_ARG(hdr->addr2));
@ -507,9 +498,9 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
} }
if (ieee->iw_mode == IW_MODE_MASTER && !wds && if (ieee->iw_mode == IW_MODE_MASTER && !wds &&
(fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS && (fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
ieee->stadev && IEEE80211_FCTL_FROMDS && ieee->stadev
memcmp(hdr->addr2, ieee->assoc_ap_addr, ETH_ALEN) == 0) { && memcmp(hdr->addr2, ieee->assoc_ap_addr, ETH_ALEN) == 0) {
/* Frame from BSSID of the AP for which we are a client */ /* Frame from BSSID of the AP for which we are a client */
skb->dev = dev = ieee->stadev; skb->dev = dev = ieee->stadev;
stats = hostap_get_stats(dev); stats = hostap_get_stats(dev);
@ -521,8 +512,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
#ifdef NOT_YET #ifdef NOT_YET
if ((ieee->iw_mode == IW_MODE_MASTER || if ((ieee->iw_mode == IW_MODE_MASTER ||
ieee->iw_mode == IW_MODE_REPEAT) && ieee->iw_mode == IW_MODE_REPEAT) && !from_assoc_ap) {
!from_assoc_ap) {
switch (hostap_handle_sta_rx(ieee, dev, skb, rx_stats, switch (hostap_handle_sta_rx(ieee, dev, skb, rx_stats,
wds != NULL)) { wds != NULL)) {
case AP_RX_CONTINUE_NOT_AUTHORIZED: case AP_RX_CONTINUE_NOT_AUTHORIZED:
@ -546,8 +536,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
stype != IEEE80211_STYPE_DATA_CFPOLL && stype != IEEE80211_STYPE_DATA_CFPOLL &&
stype != IEEE80211_STYPE_DATA_CFACKPOLL) { stype != IEEE80211_STYPE_DATA_CFACKPOLL) {
if (stype != IEEE80211_STYPE_NULLFUNC) if (stype != IEEE80211_STYPE_NULLFUNC)
IEEE80211_DEBUG_DROP( IEEE80211_DEBUG_DROP("RX: dropped data frame "
"RX: dropped data frame "
"with no data (type=0x%02x, " "with no data (type=0x%02x, "
"subtype=0x%02x, len=%d)\n", "subtype=0x%02x, len=%d)\n",
type, stype, skb->len); type, stype, skb->len);
@ -631,18 +620,16 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
/* pass unencrypted EAPOL frames even if encryption is /* pass unencrypted EAPOL frames even if encryption is
* configured */ * configured */
} else { } else {
IEEE80211_DEBUG_DROP( IEEE80211_DEBUG_DROP("encryption configured, but RX "
"encryption configured, but RX " "frame not encrypted (SA=" MAC_FMT
"frame not encrypted (SA=" MAC_FMT ")\n", ")\n", MAC_ARG(hdr->addr2));
MAC_ARG(hdr->addr2));
goto rx_dropped; goto rx_dropped;
} }
} }
if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep && if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep &&
!ieee80211_is_eapol_frame(ieee, skb)) { !ieee80211_is_eapol_frame(ieee, skb)) {
IEEE80211_DEBUG_DROP( IEEE80211_DEBUG_DROP("dropped unencrypted RX data "
"dropped unencrypted RX data "
"frame from " MAC_FMT "frame from " MAC_FMT
" (drop_unencrypted=1)\n", " (drop_unencrypted=1)\n",
MAC_ARG(hdr->addr2)); MAC_ARG(hdr->addr2));
@ -673,8 +660,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
} else if (!frame_authorized) { } else if (!frame_authorized) {
printk(KERN_DEBUG "%s: dropped frame from " printk(KERN_DEBUG "%s: dropped frame from "
"unauthorized port (IEEE 802.1X): " "unauthorized port (IEEE 802.1X): "
"ethertype=0x%04x\n", "ethertype=0x%04x\n", dev->name, ethertype);
dev->name, ethertype);
goto rx_dropped; goto rx_dropped;
} }
} }
@ -702,8 +688,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
#ifdef NOT_YET #ifdef NOT_YET
if (wds && ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) == if (wds && ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
IEEE80211_FCTL_TODS) && IEEE80211_FCTL_TODS) && skb->len >= ETH_HLEN + ETH_ALEN) {
skb->len >= ETH_HLEN + ETH_ALEN) {
/* Non-standard frame: get addr4 from its bogus location after /* Non-standard frame: get addr4 from its bogus location after
* the payload */ * the payload */
memcpy(skb->data + ETH_ALEN, memcpy(skb->data + ETH_ALEN,
@ -716,8 +701,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
stats->rx_bytes += skb->len; stats->rx_bytes += skb->len;
#ifdef NOT_YET #ifdef NOT_YET
if (ieee->iw_mode == IW_MODE_MASTER && !wds && if (ieee->iw_mode == IW_MODE_MASTER && !wds && ieee->ap->bridge_packets) {
ieee->ap->bridge_packets) {
if (dst[0] & 0x01) { if (dst[0] & 0x01) {
/* copy multicast frame both to the higher layers and /* copy multicast frame both to the higher layers and
* to the wireless media */ * to the wireless media */
@ -743,7 +727,6 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
skb2->dev = dev; skb2->dev = dev;
dev_queue_xmit(skb2); dev_queue_xmit(skb2);
} }
#endif #endif
if (skb) { if (skb) {
@ -788,10 +771,9 @@ static inline int ieee80211_is_ofdm_rate(u8 rate)
return 0; return 0;
} }
static inline int ieee80211_network_init(struct ieee80211_device *ieee,
static inline int ieee80211_network_init( struct ieee80211_probe_response
struct ieee80211_device *ieee, *beacon,
struct ieee80211_probe_response *beacon,
struct ieee80211_network *network, struct ieee80211_network *network,
struct ieee80211_rx_stats *stats) struct ieee80211_rx_stats *stats)
{ {
@ -830,10 +812,12 @@ static inline int ieee80211_network_init(
info_element = &beacon->info_element; info_element = &beacon->info_element;
left = stats->len - ((void *)info_element - (void *)beacon); left = stats->len - ((void *)info_element - (void *)beacon);
while (left >= sizeof(struct ieee80211_info_element_hdr)) { while (left >= sizeof(struct ieee80211_info_element_hdr)) {
if (sizeof(struct ieee80211_info_element_hdr) + info_element->len > left) { if (sizeof(struct ieee80211_info_element_hdr) +
IEEE80211_DEBUG_SCAN("SCAN: parse failed: info_element->len + 2 > left : info_element->len+2=%Zd left=%d.\n", info_element->len > left) {
info_element->len + sizeof(struct ieee80211_info_element), IEEE80211_DEBUG_SCAN
left); ("SCAN: parse failed: info_element->len + 2 > left : info_element->len+2=%Zd left=%d.\n",
info_element->len +
sizeof(struct ieee80211_info_element), left);
return 1; return 1;
} }
@ -847,7 +831,8 @@ static inline int ieee80211_network_init(
network->ssid_len = min(info_element->len, network->ssid_len = min(info_element->len,
(u8) IW_ESSID_MAX_SIZE); (u8) IW_ESSID_MAX_SIZE);
memcpy(network->ssid, info_element->data, network->ssid_len); memcpy(network->ssid, info_element->data,
network->ssid_len);
if (network->ssid_len < IW_ESSID_MAX_SIZE) if (network->ssid_len < IW_ESSID_MAX_SIZE)
memset(network->ssid + network->ssid_len, 0, memset(network->ssid + network->ssid_len, 0,
IW_ESSID_MAX_SIZE - network->ssid_len); IW_ESSID_MAX_SIZE - network->ssid_len);
@ -860,13 +845,18 @@ static inline int ieee80211_network_init(
#ifdef CONFIG_IEEE80211_DEBUG #ifdef CONFIG_IEEE80211_DEBUG
p = rates_str; p = rates_str;
#endif #endif
network->rates_len = min(info_element->len, MAX_RATES_LENGTH); network->rates_len =
min(info_element->len, MAX_RATES_LENGTH);
for (i = 0; i < network->rates_len; i++) { for (i = 0; i < network->rates_len; i++) {
network->rates[i] = info_element->data[i]; network->rates[i] = info_element->data[i];
#ifdef CONFIG_IEEE80211_DEBUG #ifdef CONFIG_IEEE80211_DEBUG
p += snprintf(p, sizeof(rates_str) - (p - rates_str), "%02X ", network->rates[i]); p += snprintf(p,
sizeof(rates_str) - (p -
rates_str),
"%02X ", network->rates[i]);
#endif #endif
if (ieee80211_is_ofdm_rate(info_element->data[i])) { if (ieee80211_is_ofdm_rate
(info_element->data[i])) {
network->flags |= NETWORK_HAS_OFDM; network->flags |= NETWORK_HAS_OFDM;
if (info_element->data[i] & if (info_element->data[i] &
IEEE80211_BASIC_RATE_MASK) IEEE80211_BASIC_RATE_MASK)
@ -883,13 +873,18 @@ static inline int ieee80211_network_init(
#ifdef CONFIG_IEEE80211_DEBUG #ifdef CONFIG_IEEE80211_DEBUG
p = rates_str; p = rates_str;
#endif #endif
network->rates_ex_len = min(info_element->len, MAX_RATES_EX_LENGTH); network->rates_ex_len =
min(info_element->len, MAX_RATES_EX_LENGTH);
for (i = 0; i < network->rates_ex_len; i++) { for (i = 0; i < network->rates_ex_len; i++) {
network->rates_ex[i] = info_element->data[i]; network->rates_ex[i] = info_element->data[i];
#ifdef CONFIG_IEEE80211_DEBUG #ifdef CONFIG_IEEE80211_DEBUG
p += snprintf(p, sizeof(rates_str) - (p - rates_str), "%02X ", network->rates[i]); p += snprintf(p,
sizeof(rates_str) - (p -
rates_str),
"%02X ", network->rates[i]);
#endif #endif
if (ieee80211_is_ofdm_rate(info_element->data[i])) { if (ieee80211_is_ofdm_rate
(info_element->data[i])) {
network->flags |= NETWORK_HAS_OFDM; network->flags |= NETWORK_HAS_OFDM;
if (info_element->data[i] & if (info_element->data[i] &
IEEE80211_BASIC_RATE_MASK) IEEE80211_BASIC_RATE_MASK)
@ -1032,10 +1027,13 @@ static inline void update_network(struct ieee80211_network *dst,
/* dst->last_associate is not overwritten */ /* dst->last_associate is not overwritten */
} }
static inline void ieee80211_process_probe_response( static inline void ieee80211_process_probe_response(struct ieee80211_device
struct ieee80211_device *ieee, *ieee,
struct ieee80211_probe_response *beacon, struct
struct ieee80211_rx_stats *stats) ieee80211_probe_response
*beacon,
struct ieee80211_rx_stats
*stats)
{ {
struct ieee80211_network network; struct ieee80211_network network;
struct ieee80211_network *target; struct ieee80211_network *target;
@ -1045,9 +1043,10 @@ static inline void ieee80211_process_probe_response(
#endif #endif
unsigned long flags; unsigned long flags;
IEEE80211_DEBUG_SCAN( IEEE80211_DEBUG_SCAN("'%s' (" MAC_FMT
"'%s' (" MAC_FMT "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n", "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
escape_essid(info_element->data, info_element->len), escape_essid(info_element->data,
info_element->len),
MAC_ARG(beacon->header.addr3), MAC_ARG(beacon->header.addr3),
(beacon->capability & (1 << 0xf)) ? '1' : '0', (beacon->capability & (1 << 0xf)) ? '1' : '0',
(beacon->capability & (1 << 0xe)) ? '1' : '0', (beacon->capability & (1 << 0xe)) ? '1' : '0',
@ -1071,7 +1070,8 @@ static inline void ieee80211_process_probe_response(
escape_essid(info_element->data, escape_essid(info_element->data,
info_element->len), info_element->len),
MAC_ARG(beacon->header.addr3), MAC_ARG(beacon->header.addr3),
WLAN_FC_GET_STYPE(beacon->header.frame_ctl) == WLAN_FC_GET_STYPE(beacon->header.
frame_ctl) ==
IEEE80211_STYPE_PROBE_RESP ? IEEE80211_STYPE_PROBE_RESP ?
"PROBE RESPONSE" : "BEACON"); "PROBE RESPONSE" : "BEACON");
return; return;
@ -1117,13 +1117,13 @@ static inline void ieee80211_process_probe_response(
list_del(ieee->network_free_list.next); list_del(ieee->network_free_list.next);
} }
#ifdef CONFIG_IEEE80211_DEBUG #ifdef CONFIG_IEEE80211_DEBUG
IEEE80211_DEBUG_SCAN("Adding '%s' (" MAC_FMT ") via %s.\n", IEEE80211_DEBUG_SCAN("Adding '%s' (" MAC_FMT ") via %s.\n",
escape_essid(network.ssid, escape_essid(network.ssid,
network.ssid_len), network.ssid_len),
MAC_ARG(network.bssid), MAC_ARG(network.bssid),
WLAN_FC_GET_STYPE(beacon->header.frame_ctl) == WLAN_FC_GET_STYPE(beacon->header.
frame_ctl) ==
IEEE80211_STYPE_PROBE_RESP ? IEEE80211_STYPE_PROBE_RESP ?
"PROBE RESPONSE" : "BEACON"); "PROBE RESPONSE" : "BEACON");
#endif #endif
@ -1134,7 +1134,8 @@ static inline void ieee80211_process_probe_response(
escape_essid(target->ssid, escape_essid(target->ssid,
target->ssid_len), target->ssid_len),
MAC_ARG(target->bssid), MAC_ARG(target->bssid),
WLAN_FC_GET_STYPE(beacon->header.frame_ctl) == WLAN_FC_GET_STYPE(beacon->header.
frame_ctl) ==
IEEE80211_STYPE_PROBE_RESP ? IEEE80211_STYPE_PROBE_RESP ?
"PROBE RESPONSE" : "BEACON"); "PROBE RESPONSE" : "BEACON");
update_network(target, &network); update_network(target, &network);
@ -1162,16 +1163,20 @@ void ieee80211_rx_mgt(struct ieee80211_device *ieee,
IEEE80211_DEBUG_MGMT("received PROBE RESPONSE (%d)\n", IEEE80211_DEBUG_MGMT("received PROBE RESPONSE (%d)\n",
WLAN_FC_GET_STYPE(header->frame_ctl)); WLAN_FC_GET_STYPE(header->frame_ctl));
IEEE80211_DEBUG_SCAN("Probe response\n"); IEEE80211_DEBUG_SCAN("Probe response\n");
ieee80211_process_probe_response( ieee80211_process_probe_response(ieee,
ieee, (struct ieee80211_probe_response *)header, stats); (struct
ieee80211_probe_response *)
header, stats);
break; break;
case IEEE80211_STYPE_BEACON: case IEEE80211_STYPE_BEACON:
IEEE80211_DEBUG_MGMT("received BEACON (%d)\n", IEEE80211_DEBUG_MGMT("received BEACON (%d)\n",
WLAN_FC_GET_STYPE(header->frame_ctl)); WLAN_FC_GET_STYPE(header->frame_ctl));
IEEE80211_DEBUG_SCAN("Beacon\n"); IEEE80211_DEBUG_SCAN("Beacon\n");
ieee80211_process_probe_response( ieee80211_process_probe_response(ieee,
ieee, (struct ieee80211_probe_response *)header, stats); (struct
ieee80211_probe_response *)
header, stats);
break; break;
default: default:
@ -1184,6 +1189,5 @@ void ieee80211_rx_mgt(struct ieee80211_device *ieee,
} }
} }
EXPORT_SYMBOL(ieee80211_rx_mgt); EXPORT_SYMBOL(ieee80211_rx_mgt);
EXPORT_SYMBOL(ieee80211_rx); EXPORT_SYMBOL(ieee80211_rx);

34
net/ieee80211/ieee80211_tx.c
View file

@ -45,10 +45,8 @@
#include <net/ieee80211.h> #include <net/ieee80211.h>
/* /*
802.11 Data Frame 802.11 Data Frame
,-------------------------------------------------------------------. ,-------------------------------------------------------------------.
@ -82,7 +80,6 @@ Desc. | IV | Encrypted | ICV |
`-----------------------' `-----------------------'
Total: 8 non-data bytes Total: 8 non-data bytes
802.3 Ethernet Data Frame 802.3 Ethernet Data Frame
,-----------------------------------------. ,-----------------------------------------.
@ -154,10 +151,8 @@ static inline int ieee80211_put_snap(u8 *data, u16 h_proto)
return SNAP_SIZE + sizeof(u16); return SNAP_SIZE + sizeof(u16);
} }
static inline int ieee80211_encrypt_fragment( static inline int ieee80211_encrypt_fragment(struct ieee80211_device *ieee,
struct ieee80211_device *ieee, struct sk_buff *frag, int hdr_len)
struct sk_buff *frag,
int hdr_len)
{ {
struct ieee80211_crypt_data *crypt = ieee->crypt[ieee->tx_keyidx]; struct ieee80211_crypt_data *crypt = ieee->crypt[ieee->tx_keyidx];
int res; int res;
@ -200,8 +195,8 @@ static inline int ieee80211_encrypt_fragment(
return 0; return 0;
} }
void ieee80211_txb_free(struct ieee80211_txb *txb)
void ieee80211_txb_free(struct ieee80211_txb *txb) { {
int i; int i;
if (unlikely(!txb)) if (unlikely(!txb))
return; return;
@ -216,8 +211,7 @@ static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
{ {
struct ieee80211_txb *txb; struct ieee80211_txb *txb;
int i; int i;
txb = kmalloc( txb = kmalloc(sizeof(struct ieee80211_txb) + (sizeof(u8 *) * nr_frags),
sizeof(struct ieee80211_txb) + (sizeof(u8*) * nr_frags),
gfp_mask); gfp_mask);
if (!txb) if (!txb)
return NULL; return NULL;
@ -243,8 +237,7 @@ static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
} }
/* SKBs are added to the ieee->tx_queue. */ /* SKBs are added to the ieee->tx_queue. */
int ieee80211_xmit(struct sk_buff *skb, int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
struct net_device *dev)
{ {
struct ieee80211_device *ieee = netdev_priv(dev); struct ieee80211_device *ieee = netdev_priv(dev);
struct ieee80211_txb *txb = NULL; struct ieee80211_txb *txb = NULL;
@ -268,8 +261,7 @@ int ieee80211_xmit(struct sk_buff *skb,
/* If there is no driver handler to take the TXB, dont' bother /* If there is no driver handler to take the TXB, dont' bother
* creating it... */ * creating it... */
if (!ieee->hard_start_xmit) { if (!ieee->hard_start_xmit) {
printk(KERN_WARNING "%s: No xmit handler.\n", printk(KERN_WARNING "%s: No xmit handler.\n", ieee->dev->name);
ieee->dev->name);
goto success; goto success;
} }
@ -327,8 +319,7 @@ int ieee80211_xmit(struct sk_buff *skb,
/* Determine fragmentation size based on destination (multicast /* Determine fragmentation size based on destination (multicast
* and broadcast are not fragmented) */ * and broadcast are not fragmented) */
if (is_multicast_ether_addr(dest) || if (is_multicast_ether_addr(dest) || is_broadcast_ether_addr(dest))
is_broadcast_ether_addr(dest))
frag_size = MAX_FRAG_THRESHOLD; frag_size = MAX_FRAG_THRESHOLD;
else else
frag_size = ieee->fts; frag_size = ieee->fts;
@ -380,8 +371,8 @@ int ieee80211_xmit(struct sk_buff *skb,
/* If this is not the last fragment, then add the MOREFRAGS /* If this is not the last fragment, then add the MOREFRAGS
* bit to the frame control */ * bit to the frame control */
if (i != nr_frags - 1) { if (i != nr_frags - 1) {
frag_hdr->frame_ctl = cpu_to_le16( frag_hdr->frame_ctl =
fc | IEEE80211_FCTL_MOREFRAGS); cpu_to_le16(fc | IEEE80211_FCTL_MOREFRAGS);
bytes = bytes_per_frag; bytes = bytes_per_frag;
} else { } else {
/* The last fragment takes the remaining length */ /* The last fragment takes the remaining length */
@ -390,8 +381,8 @@ int ieee80211_xmit(struct sk_buff *skb,
/* Put a SNAP header on the first fragment */ /* Put a SNAP header on the first fragment */
if (i == 0) { if (i == 0) {
ieee80211_put_snap( ieee80211_put_snap(skb_put
skb_put(skb_frag, SNAP_SIZE + sizeof(u16)), (skb_frag, SNAP_SIZE + sizeof(u16)),
ether_type); ether_type);
bytes -= SNAP_SIZE + sizeof(u16); bytes -= SNAP_SIZE + sizeof(u16);
} }
@ -410,7 +401,6 @@ int ieee80211_xmit(struct sk_buff *skb,
skb_put(skb_frag, 4); skb_put(skb_frag, 4);
} }
success: success:
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);

41
net/ieee80211/ieee80211_wx.c
View file

@ -29,12 +29,13 @@
Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
******************************************************************************/ ******************************************************************************/
#include <linux/wireless.h>
#include <linux/version.h>
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/module.h> #include <linux/module.h>
#include <net/ieee80211.h> #include <net/ieee80211.h>
#include <linux/wireless.h>
static const char *ieee80211_modes[] = { static const char *ieee80211_modes[] = {
"?", "a", "b", "ab", "g", "ag", "bg", "abg" "?", "a", "b", "ab", "g", "ag", "bg", "abg"
}; };
@ -71,20 +72,19 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
/* Add the protocol name */ /* Add the protocol name */
iwe.cmd = SIOCGIWNAME; iwe.cmd = SIOCGIWNAME;
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11%s", ieee80211_modes[network->mode]); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11%s",
ieee80211_modes[network->mode]);
start = iwe_stream_add_event(start, stop, &iwe, IW_EV_CHAR_LEN); start = iwe_stream_add_event(start, stop, &iwe, IW_EV_CHAR_LEN);
/* Add mode */ /* Add mode */
iwe.cmd = SIOCGIWMODE; iwe.cmd = SIOCGIWMODE;
if (network->capability & if (network->capability & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)) {
(WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)) {
if (network->capability & WLAN_CAPABILITY_ESS) if (network->capability & WLAN_CAPABILITY_ESS)
iwe.u.mode = IW_MODE_MASTER; iwe.u.mode = IW_MODE_MASTER;
else else
iwe.u.mode = IW_MODE_ADHOC; iwe.u.mode = IW_MODE_ADHOC;
start = iwe_stream_add_event(start, stop, &iwe, start = iwe_stream_add_event(start, stop, &iwe, IW_EV_UINT_LEN);
IW_EV_UINT_LEN);
} }
/* Add frequency/channel */ /* Add frequency/channel */
@ -132,8 +132,7 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
iwe.cmd = SIOCGIWRATE; iwe.cmd = SIOCGIWRATE;
iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0; iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
iwe.u.bitrate.value = max_rate * 500000; iwe.u.bitrate.value = max_rate * 500000;
start = iwe_stream_add_event(start, stop, &iwe, start = iwe_stream_add_event(start, stop, &iwe, IW_EV_PARAM_LEN);
IW_EV_PARAM_LEN);
iwe.cmd = IWEVCUSTOM; iwe.cmd = IWEVCUSTOM;
iwe.u.data.length = p - custom; iwe.u.data.length = p - custom;
@ -198,12 +197,12 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
iwe.cmd = IWEVCUSTOM; iwe.cmd = IWEVCUSTOM;
p = custom; p = custom;
p += snprintf(p, MAX_CUSTOM_LEN - (p - custom), p += snprintf(p, MAX_CUSTOM_LEN - (p - custom),
" Last beacon: %lums ago", (jiffies - network->last_scanned) / (HZ / 100)); " Last beacon: %lums ago",
(jiffies - network->last_scanned) / (HZ / 100));
iwe.u.data.length = p - custom; iwe.u.data.length = p - custom;
if (iwe.u.data.length) if (iwe.u.data.length)
start = iwe_stream_add_point(start, stop, &iwe, custom); start = iwe_stream_add_point(start, stop, &iwe, custom);
return start; return start;
} }
@ -228,13 +227,14 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
time_after(network->last_scanned + ieee->scan_age, jiffies)) time_after(network->last_scanned + ieee->scan_age, jiffies))
ev = ipw2100_translate_scan(ieee, ev, stop, network); ev = ipw2100_translate_scan(ieee, ev, stop, network);
else else
IEEE80211_DEBUG_SCAN( IEEE80211_DEBUG_SCAN("Not showing network '%s ("
"Not showing network '%s ("
MAC_FMT ")' due to age (%lums).\n", MAC_FMT ")' due to age (%lums).\n",
escape_essid(network->ssid, escape_essid(network->ssid,
network->ssid_len), network->ssid_len),
MAC_ARG(network->bssid), MAC_ARG(network->bssid),
(jiffies - network->last_scanned) / (HZ / 100)); (jiffies -
network->last_scanned) / (HZ /
100));
} }
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);
@ -291,8 +291,8 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
if (ieee->crypt[i] != NULL) { if (ieee->crypt[i] != NULL) {
if (key_provided) if (key_provided)
break; break;
ieee80211_crypt_delayed_deinit( ieee80211_crypt_delayed_deinit(ieee,
ieee, &ieee->crypt[i]); &ieee->crypt[i]);
} }
} }
@ -305,8 +305,6 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
goto done; goto done;
} }
sec.enabled = 1; sec.enabled = 1;
sec.flags |= SEC_ENABLED; sec.flags |= SEC_ENABLED;
@ -340,8 +338,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
new_crypt = NULL; new_crypt = NULL;
printk(KERN_WARNING "%s: could not initialize WEP: " printk(KERN_WARNING "%s: could not initialize WEP: "
"load module ieee80211_crypt_wep\n", "load module ieee80211_crypt_wep\n", dev->name);
dev->name);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
*crypt = new_crypt; *crypt = new_crypt;
@ -381,8 +378,8 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
/* No key data - just set the default TX key index */ /* No key data - just set the default TX key index */
if (key_provided) { if (key_provided) {
IEEE80211_DEBUG_WX( IEEE80211_DEBUG_WX
"Setting key %d to default Tx key.\n", key); ("Setting key %d to default Tx key.\n", key);
ieee->tx_keyidx = key; ieee->tx_keyidx = key;
sec.active_key = key; sec.active_key = key;
sec.flags |= SEC_ACTIVE_KEY; sec.flags |= SEC_ACTIVE_KEY;