diff options
Diffstat (limited to 'drivers/net')
39 files changed, 2753 insertions, 2457 deletions
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c index 1247a25f1093..9e1fe2e0478c 100644 --- a/drivers/net/3c523.c +++ b/drivers/net/3c523.c | |||
@@ -1274,6 +1274,7 @@ module_param_array(irq, int, NULL, 0); | |||
1274 | module_param_array(io, int, NULL, 0); | 1274 | module_param_array(io, int, NULL, 0); |
1275 | MODULE_PARM_DESC(io, "EtherLink/MC I/O base address(es)"); | 1275 | MODULE_PARM_DESC(io, "EtherLink/MC I/O base address(es)"); |
1276 | MODULE_PARM_DESC(irq, "EtherLink/MC IRQ number(s)"); | 1276 | MODULE_PARM_DESC(irq, "EtherLink/MC IRQ number(s)"); |
1277 | MODULE_LICENSE("GPL"); | ||
1277 | 1278 | ||
1278 | int init_module(void) | 1279 | int init_module(void) |
1279 | { | 1280 | { |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 47e158fa5aac..2b55687f6ee9 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -1320,7 +1320,7 @@ config FORCEDETH | |||
1320 | 1320 | ||
1321 | config CS89x0 | 1321 | config CS89x0 |
1322 | tristate "CS89x0 support" | 1322 | tristate "CS89x0 support" |
1323 | depends on NET_PCI && (ISA || ARCH_IXDP2X01) | 1323 | depends on (NET_PCI && (ISA || ARCH_IXDP2X01)) || ARCH_PNX0105 |
1324 | ---help--- | 1324 | ---help--- |
1325 | Support for CS89x0 chipset based Ethernet cards. If you have a | 1325 | Support for CS89x0 chipset based Ethernet cards. If you have a |
1326 | network (Ethernet) card of this type, say Y and read the | 1326 | network (Ethernet) card of this type, say Y and read the |
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 3fe8ba992c38..f1bd45e3da31 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
@@ -1285,6 +1285,9 @@ static int b44_open(struct net_device *dev) | |||
1285 | b44_init_hw(bp); | 1285 | b44_init_hw(bp); |
1286 | bp->flags |= B44_FLAG_INIT_COMPLETE; | 1286 | bp->flags |= B44_FLAG_INIT_COMPLETE; |
1287 | 1287 | ||
1288 | netif_carrier_off(dev); | ||
1289 | b44_check_phy(bp); | ||
1290 | |||
1288 | spin_unlock_irq(&bp->lock); | 1291 | spin_unlock_irq(&bp->lock); |
1289 | 1292 | ||
1290 | init_timer(&bp->timer); | 1293 | init_timer(&bp->timer); |
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index 25e4495de79e..b96d6fb1929e 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
@@ -174,6 +174,13 @@ static unsigned int cs8900_irq_map[] = {1,0,0,0}; | |||
174 | #include <asm/irq.h> | 174 | #include <asm/irq.h> |
175 | static unsigned int netcard_portlist[] __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0}; | 175 | static unsigned int netcard_portlist[] __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0}; |
176 | static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0}; | 176 | static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0}; |
177 | #elif defined(CONFIG_ARCH_PNX0105) | ||
178 | #include <asm/irq.h> | ||
179 | #include <asm/arch/gpio.h> | ||
180 | #define CIRRUS_DEFAULT_BASE IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000) /* = Physical address 0x48200000 */ | ||
181 | #define CIRRUS_DEFAULT_IRQ VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */ | ||
182 | static unsigned int netcard_portlist[] __initdata = {CIRRUS_DEFAULT_BASE, 0}; | ||
183 | static unsigned int cs8900_irq_map[] = {CIRRUS_DEFAULT_IRQ, 0, 0, 0}; | ||
177 | #else | 184 | #else |
178 | static unsigned int netcard_portlist[] __initdata = | 185 | static unsigned int netcard_portlist[] __initdata = |
179 | { 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0}; | 186 | { 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0}; |
@@ -431,6 +438,30 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular) | |||
431 | #endif | 438 | #endif |
432 | } | 439 | } |
433 | 440 | ||
441 | #ifdef CONFIG_ARCH_PNX0105 | ||
442 | initialize_ebi(); | ||
443 | |||
444 | /* Map GPIO registers for the pins connected to the CS8900a. */ | ||
445 | if (map_cirrus_gpio() < 0) | ||
446 | return -ENODEV; | ||
447 | |||
448 | reset_cirrus(); | ||
449 | |||
450 | /* Map event-router registers. */ | ||
451 | if (map_event_router() < 0) | ||
452 | return -ENODEV; | ||
453 | |||
454 | enable_cirrus_irq(); | ||
455 | |||
456 | unmap_cirrus_gpio(); | ||
457 | unmap_event_router(); | ||
458 | |||
459 | dev->base_addr = ioaddr; | ||
460 | |||
461 | for (i = 0 ; i < 3 ; i++) | ||
462 | readreg(dev, 0); | ||
463 | #endif | ||
464 | |||
434 | /* Grab the region so we can find another board if autoIRQ fails. */ | 465 | /* Grab the region so we can find another board if autoIRQ fails. */ |
435 | /* WTF is going on here? */ | 466 | /* WTF is going on here? */ |
436 | if (!request_region(ioaddr & ~3, NETCARD_IO_EXTENT, DRV_NAME)) { | 467 | if (!request_region(ioaddr & ~3, NETCARD_IO_EXTENT, DRV_NAME)) { |
@@ -672,7 +703,7 @@ printk("PP_addr=0x%x\n", inw(ioaddr + ADD_PORT)); | |||
672 | } else { | 703 | } else { |
673 | i = lp->isa_config & INT_NO_MASK; | 704 | i = lp->isa_config & INT_NO_MASK; |
674 | if (lp->chip_type == CS8900) { | 705 | if (lp->chip_type == CS8900) { |
675 | #ifdef CONFIG_ARCH_IXDP2X01 | 706 | #if defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX0105) |
676 | i = cs8900_irq_map[0]; | 707 | i = cs8900_irq_map[0]; |
677 | #else | 708 | #else |
678 | /* Translate the IRQ using the IRQ mapping table. */ | 709 | /* Translate the IRQ using the IRQ mapping table. */ |
@@ -1145,7 +1176,7 @@ net_open(struct net_device *dev) | |||
1145 | int i; | 1176 | int i; |
1146 | int ret; | 1177 | int ret; |
1147 | 1178 | ||
1148 | #ifndef CONFIG_SH_HICOSH4 /* uses irq#1, so this won't work */ | 1179 | #if !defined(CONFIG_SH_HICOSH4) && !defined(CONFIG_ARCH_PNX0105) /* uses irq#1, so this won't work */ |
1149 | if (dev->irq < 2) { | 1180 | if (dev->irq < 2) { |
1150 | /* Allow interrupts to be generated by the chip */ | 1181 | /* Allow interrupts to be generated by the chip */ |
1151 | /* Cirrus' release had this: */ | 1182 | /* Cirrus' release had this: */ |
@@ -1176,7 +1207,7 @@ net_open(struct net_device *dev) | |||
1176 | else | 1207 | else |
1177 | #endif | 1208 | #endif |
1178 | { | 1209 | { |
1179 | #ifndef CONFIG_ARCH_IXDP2X01 | 1210 | #if !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX0105) |
1180 | if (((1 << dev->irq) & lp->irq_map) == 0) { | 1211 | if (((1 << dev->irq) & lp->irq_map) == 0) { |
1181 | printk(KERN_ERR "%s: IRQ %d is not in our map of allowable IRQs, which is %x\n", | 1212 | printk(KERN_ERR "%s: IRQ %d is not in our map of allowable IRQs, which is %x\n", |
1182 | dev->name, dev->irq, lp->irq_map); | 1213 | dev->name, dev->irq, lp->irq_map); |
@@ -1261,6 +1292,9 @@ net_open(struct net_device *dev) | |||
1261 | case A_CNF_MEDIA_10B_2: result = lp->adapter_cnf & A_CNF_10B_2; break; | 1292 | case A_CNF_MEDIA_10B_2: result = lp->adapter_cnf & A_CNF_10B_2; break; |
1262 | default: result = lp->adapter_cnf & (A_CNF_10B_T | A_CNF_AUI | A_CNF_10B_2); | 1293 | default: result = lp->adapter_cnf & (A_CNF_10B_T | A_CNF_AUI | A_CNF_10B_2); |
1263 | } | 1294 | } |
1295 | #ifdef CONFIG_ARCH_PNX0105 | ||
1296 | result = A_CNF_10B_T; | ||
1297 | #endif | ||
1264 | if (!result) { | 1298 | if (!result) { |
1265 | printk(KERN_ERR "%s: EEPROM is configured for unavailable media\n", dev->name); | 1299 | printk(KERN_ERR "%s: EEPROM is configured for unavailable media\n", dev->name); |
1266 | release_irq: | 1300 | release_irq: |
diff --git a/drivers/net/cs89x0.h b/drivers/net/cs89x0.h index b0ef7ad2baad..bd3ad8e6cce9 100644 --- a/drivers/net/cs89x0.h +++ b/drivers/net/cs89x0.h | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | #include <linux/config.h> | 17 | #include <linux/config.h> |
18 | 18 | ||
19 | #ifdef CONFIG_ARCH_IXDP2X01 | 19 | #if defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX0105) |
20 | /* IXDP2401/IXDP2801 uses dword-aligned register addressing */ | 20 | /* IXDP2401/IXDP2801 uses dword-aligned register addressing */ |
21 | #define CS89x0_PORT(reg) ((reg) * 2) | 21 | #define CS89x0_PORT(reg) ((reg) * 2) |
22 | #else | 22 | #else |
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index cfaa6b2bf345..1e56c8eea35f 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -1093,11 +1093,16 @@ static int e100_phy_init(struct nic *nic) | |||
1093 | } | 1093 | } |
1094 | 1094 | ||
1095 | if((nic->mac >= mac_82550_D102) || ((nic->flags & ich) && | 1095 | if((nic->mac >= mac_82550_D102) || ((nic->flags & ich) && |
1096 | (mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & 0x8000) && | 1096 | (mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & 0x8000))) { |
1097 | (nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))) | 1097 | /* enable/disable MDI/MDI-X auto-switching. |
1098 | /* enable/disable MDI/MDI-X auto-switching */ | 1098 | MDI/MDI-X auto-switching is disabled for 82551ER/QM chips */ |
1099 | mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG, | 1099 | if((nic->mac == mac_82551_E) || (nic->mac == mac_82551_F) || |
1100 | nic->mii.force_media ? 0 : NCONFIG_AUTO_SWITCH); | 1100 | (nic->mac == mac_82551_10) || (nic->mii.force_media) || |
1101 | !(nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled)) | ||
1102 | mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG, 0); | ||
1103 | else | ||
1104 | mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG, NCONFIG_AUTO_SWITCH); | ||
1105 | } | ||
1101 | 1106 | ||
1102 | return 0; | 1107 | return 0; |
1103 | } | 1108 | } |
@@ -1666,8 +1671,10 @@ static irqreturn_t e100_intr(int irq, void *dev_id, struct pt_regs *regs) | |||
1666 | if(stat_ack & stat_ack_rnr) | 1671 | if(stat_ack & stat_ack_rnr) |
1667 | nic->ru_running = RU_SUSPENDED; | 1672 | nic->ru_running = RU_SUSPENDED; |
1668 | 1673 | ||
1669 | e100_disable_irq(nic); | 1674 | if(likely(netif_rx_schedule_prep(netdev))) { |
1670 | netif_rx_schedule(netdev); | 1675 | e100_disable_irq(nic); |
1676 | __netif_rx_schedule(netdev); | ||
1677 | } | ||
1671 | 1678 | ||
1672 | return IRQ_HANDLED; | 1679 | return IRQ_HANDLED; |
1673 | } | 1680 | } |
@@ -2335,11 +2342,11 @@ static int __devinit e100_probe(struct pci_dev *pdev, | |||
2335 | goto err_out_iounmap; | 2342 | goto err_out_iounmap; |
2336 | } | 2343 | } |
2337 | 2344 | ||
2338 | e100_phy_init(nic); | ||
2339 | |||
2340 | if((err = e100_eeprom_load(nic))) | 2345 | if((err = e100_eeprom_load(nic))) |
2341 | goto err_out_free; | 2346 | goto err_out_free; |
2342 | 2347 | ||
2348 | e100_phy_init(nic); | ||
2349 | |||
2343 | memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN); | 2350 | memcpy(netdev->dev_addr, nic->eeprom, ETH_ALEN); |
2344 | if(!is_valid_ether_addr(netdev->dev_addr)) { | 2351 | if(!is_valid_ether_addr(netdev->dev_addr)) { |
2345 | DPRINTK(PROBE, ERR, "Invalid MAC address from " | 2352 | DPRINTK(PROBE, ERR, "Invalid MAC address from " |
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index af1e82c5b808..092757bc721f 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h | |||
@@ -140,7 +140,7 @@ struct e1000_adapter; | |||
140 | #define E1000_RX_BUFFER_WRITE 16 /* Must be power of 2 */ | 140 | #define E1000_RX_BUFFER_WRITE 16 /* Must be power of 2 */ |
141 | 141 | ||
142 | #define AUTO_ALL_MODES 0 | 142 | #define AUTO_ALL_MODES 0 |
143 | #define E1000_EEPROM_82544_APM 0x0400 | 143 | #define E1000_EEPROM_82544_APM 0x0004 |
144 | #define E1000_EEPROM_APME 0x0400 | 144 | #define E1000_EEPROM_APME 0x0400 |
145 | 145 | ||
146 | #ifndef E1000_MASTER_SLAVE | 146 | #ifndef E1000_MASTER_SLAVE |
@@ -159,7 +159,7 @@ struct e1000_adapter; | |||
159 | * so a DMA handle can be stored along with the buffer */ | 159 | * so a DMA handle can be stored along with the buffer */ |
160 | struct e1000_buffer { | 160 | struct e1000_buffer { |
161 | struct sk_buff *skb; | 161 | struct sk_buff *skb; |
162 | uint64_t dma; | 162 | dma_addr_t dma; |
163 | unsigned long time_stamp; | 163 | unsigned long time_stamp; |
164 | uint16_t length; | 164 | uint16_t length; |
165 | uint16_t next_to_watch; | 165 | uint16_t next_to_watch; |
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index 237247f74df4..f133ff0b0b94 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
@@ -105,7 +105,7 @@ static const char e1000_gstrings_test[][ETH_GSTRING_LEN] = { | |||
105 | static int | 105 | static int |
106 | e1000_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) | 106 | e1000_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) |
107 | { | 107 | { |
108 | struct e1000_adapter *adapter = netdev->priv; | 108 | struct e1000_adapter *adapter = netdev_priv(netdev); |
109 | struct e1000_hw *hw = &adapter->hw; | 109 | struct e1000_hw *hw = &adapter->hw; |
110 | 110 | ||
111 | if(hw->media_type == e1000_media_type_copper) { | 111 | if(hw->media_type == e1000_media_type_copper) { |
@@ -141,9 +141,9 @@ e1000_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) | |||
141 | SUPPORTED_FIBRE | | 141 | SUPPORTED_FIBRE | |
142 | SUPPORTED_Autoneg); | 142 | SUPPORTED_Autoneg); |
143 | 143 | ||
144 | ecmd->advertising = (SUPPORTED_1000baseT_Full | | 144 | ecmd->advertising = (ADVERTISED_1000baseT_Full | |
145 | SUPPORTED_FIBRE | | 145 | ADVERTISED_FIBRE | |
146 | SUPPORTED_Autoneg); | 146 | ADVERTISED_Autoneg); |
147 | 147 | ||
148 | ecmd->port = PORT_FIBRE; | 148 | ecmd->port = PORT_FIBRE; |
149 | 149 | ||
@@ -179,13 +179,24 @@ e1000_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) | |||
179 | static int | 179 | static int |
180 | e1000_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) | 180 | e1000_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) |
181 | { | 181 | { |
182 | struct e1000_adapter *adapter = netdev->priv; | 182 | struct e1000_adapter *adapter = netdev_priv(netdev); |
183 | struct e1000_hw *hw = &adapter->hw; | 183 | struct e1000_hw *hw = &adapter->hw; |
184 | 184 | ||
185 | if(ecmd->autoneg == AUTONEG_ENABLE) { | 185 | if(ecmd->autoneg == AUTONEG_ENABLE) { |
186 | hw->autoneg = 1; | 186 | hw->autoneg = 1; |
187 | hw->autoneg_advertised = 0x002F; | 187 | if(hw->media_type == e1000_media_type_fiber) |
188 | ecmd->advertising = 0x002F; | 188 | hw->autoneg_advertised = ADVERTISED_1000baseT_Full | |
189 | ADVERTISED_FIBRE | | ||
190 | ADVERTISED_Autoneg; | ||
191 | else | ||
192 | hw->autoneg_advertised = ADVERTISED_10baseT_Half | | ||
193 | ADVERTISED_10baseT_Full | | ||
194 | ADVERTISED_100baseT_Half | | ||
195 | ADVERTISED_100baseT_Full | | ||
196 | ADVERTISED_1000baseT_Full| | ||
197 | ADVERTISED_Autoneg | | ||
198 | ADVERTISED_TP; | ||
199 | ecmd->advertising = hw->autoneg_advertised; | ||
189 | } else | 200 | } else |
190 | if(e1000_set_spd_dplx(adapter, ecmd->speed + ecmd->duplex)) | 201 | if(e1000_set_spd_dplx(adapter, ecmd->speed + ecmd->duplex)) |
191 | return -EINVAL; | 202 | return -EINVAL; |
@@ -206,7 +217,7 @@ static void | |||
206 | e1000_get_pauseparam(struct net_device *netdev, | 217 | e1000_get_pauseparam(struct net_device *netdev, |
207 | struct ethtool_pauseparam *pause) | 218 | struct ethtool_pauseparam *pause) |
208 | { | 219 | { |
209 | struct e1000_adapter *adapter = netdev->priv; | 220 | struct e1000_adapter *adapter = netdev_priv(netdev); |
210 | struct e1000_hw *hw = &adapter->hw; | 221 | struct e1000_hw *hw = &adapter->hw; |
211 | 222 | ||
212 | pause->autoneg = | 223 | pause->autoneg = |
@@ -226,7 +237,7 @@ static int | |||
226 | e1000_set_pauseparam(struct net_device *netdev, | 237 | e1000_set_pauseparam(struct net_device *netdev, |
227 | struct ethtool_pauseparam *pause) | 238 | struct ethtool_pauseparam *pause) |
228 | { | 239 | { |
229 | struct e1000_adapter *adapter = netdev->priv; | 240 | struct e1000_adapter *adapter = netdev_priv(netdev); |
230 | struct e1000_hw *hw = &adapter->hw; | 241 | struct e1000_hw *hw = &adapter->hw; |
231 | 242 | ||
232 | adapter->fc_autoneg = pause->autoneg; | 243 | adapter->fc_autoneg = pause->autoneg; |
@@ -259,14 +270,14 @@ e1000_set_pauseparam(struct net_device *netdev, | |||
259 | static uint32_t | 270 | static uint32_t |
260 | e1000_get_rx_csum(struct net_device *netdev) | 271 | e1000_get_rx_csum(struct net_device *netdev) |
261 | { | 272 | { |
262 | struct e1000_adapter *adapter = netdev->priv; | 273 | struct e1000_adapter *adapter = netdev_priv(netdev); |
263 | return adapter->rx_csum; | 274 | return adapter->rx_csum; |
264 | } | 275 | } |
265 | 276 | ||
266 | static int | 277 | static int |
267 | e1000_set_rx_csum(struct net_device *netdev, uint32_t data) | 278 | e1000_set_rx_csum(struct net_device *netdev, uint32_t data) |
268 | { | 279 | { |
269 | struct e1000_adapter *adapter = netdev->priv; | 280 | struct e1000_adapter *adapter = netdev_priv(netdev); |
270 | adapter->rx_csum = data; | 281 | adapter->rx_csum = data; |
271 | 282 | ||
272 | if(netif_running(netdev)) { | 283 | if(netif_running(netdev)) { |
@@ -286,7 +297,7 @@ e1000_get_tx_csum(struct net_device *netdev) | |||
286 | static int | 297 | static int |
287 | e1000_set_tx_csum(struct net_device *netdev, uint32_t data) | 298 | e1000_set_tx_csum(struct net_device *netdev, uint32_t data) |
288 | { | 299 | { |
289 | struct e1000_adapter *adapter = netdev->priv; | 300 | struct e1000_adapter *adapter = netdev_priv(netdev); |
290 | 301 | ||
291 | if(adapter->hw.mac_type < e1000_82543) { | 302 | if(adapter->hw.mac_type < e1000_82543) { |
292 | if (!data) | 303 | if (!data) |
@@ -306,8 +317,8 @@ e1000_set_tx_csum(struct net_device *netdev, uint32_t data) | |||
306 | static int | 317 | static int |
307 | e1000_set_tso(struct net_device *netdev, uint32_t data) | 318 | e1000_set_tso(struct net_device *netdev, uint32_t data) |
308 | { | 319 | { |
309 | struct e1000_adapter *adapter = netdev->priv; | 320 | struct e1000_adapter *adapter = netdev_priv(netdev); |
310 | if ((adapter->hw.mac_type < e1000_82544) || | 321 | if((adapter->hw.mac_type < e1000_82544) || |
311 | (adapter->hw.mac_type == e1000_82547)) | 322 | (adapter->hw.mac_type == e1000_82547)) |
312 | return data ? -EINVAL : 0; | 323 | return data ? -EINVAL : 0; |
313 | 324 | ||
@@ -322,14 +333,14 @@ e1000_set_tso(struct net_device *netdev, uint32_t data) | |||
322 | static uint32_t | 333 | static uint32_t |
323 | e1000_get_msglevel(struct net_device *netdev) | 334 | e1000_get_msglevel(struct net_device *netdev) |
324 | { | 335 | { |
325 | struct e1000_adapter *adapter = netdev->priv; | 336 | struct e1000_adapter *adapter = netdev_priv(netdev); |
326 | return adapter->msg_enable; | 337 | return adapter->msg_enable; |
327 | } | 338 | } |
328 | 339 | ||
329 | static void | 340 | static void |
330 | e1000_set_msglevel(struct net_device *netdev, uint32_t data) | 341 | e1000_set_msglevel(struct net_device *netdev, uint32_t data) |
331 | { | 342 | { |
332 | struct e1000_adapter *adapter = netdev->priv; | 343 | struct e1000_adapter *adapter = netdev_priv(netdev); |
333 | adapter->msg_enable = data; | 344 | adapter->msg_enable = data; |
334 | } | 345 | } |
335 | 346 | ||
@@ -344,7 +355,7 @@ static void | |||
344 | e1000_get_regs(struct net_device *netdev, | 355 | e1000_get_regs(struct net_device *netdev, |
345 | struct ethtool_regs *regs, void *p) | 356 | struct ethtool_regs *regs, void *p) |
346 | { | 357 | { |
347 | struct e1000_adapter *adapter = netdev->priv; | 358 | struct e1000_adapter *adapter = netdev_priv(netdev); |
348 | struct e1000_hw *hw = &adapter->hw; | 359 | struct e1000_hw *hw = &adapter->hw; |
349 | uint32_t *regs_buff = p; | 360 | uint32_t *regs_buff = p; |
350 | uint16_t phy_data; | 361 | uint16_t phy_data; |
@@ -432,7 +443,7 @@ e1000_get_regs(struct net_device *netdev, | |||
432 | static int | 443 | static int |
433 | e1000_get_eeprom_len(struct net_device *netdev) | 444 | e1000_get_eeprom_len(struct net_device *netdev) |
434 | { | 445 | { |
435 | struct e1000_adapter *adapter = netdev->priv; | 446 | struct e1000_adapter *adapter = netdev_priv(netdev); |
436 | return adapter->hw.eeprom.word_size * 2; | 447 | return adapter->hw.eeprom.word_size * 2; |
437 | } | 448 | } |
438 | 449 | ||
@@ -440,7 +451,7 @@ static int | |||
440 | e1000_get_eeprom(struct net_device *netdev, | 451 | e1000_get_eeprom(struct net_device *netdev, |
441 | struct ethtool_eeprom *eeprom, uint8_t *bytes) | 452 | struct ethtool_eeprom *eeprom, uint8_t *bytes) |
442 | { | 453 | { |
443 | struct e1000_adapter *adapter = netdev->priv; | 454 | struct e1000_adapter *adapter = netdev_priv(netdev); |
444 | struct e1000_hw *hw = &adapter->hw; | 455 | struct e1000_hw *hw = &adapter->hw; |
445 | uint16_t *eeprom_buff; | 456 | uint16_t *eeprom_buff; |
446 | int first_word, last_word; | 457 | int first_word, last_word; |
@@ -486,7 +497,7 @@ static int | |||
486 | e1000_set_eeprom(struct net_device *netdev, | 497 | e1000_set_eeprom(struct net_device *netdev, |
487 | struct ethtool_eeprom *eeprom, uint8_t *bytes) | 498 | struct ethtool_eeprom *eeprom, uint8_t *bytes) |
488 | { | 499 | { |
489 | struct e1000_adapter *adapter = netdev->priv; | 500 | struct e1000_adapter *adapter = netdev_priv(netdev); |
490 | struct e1000_hw *hw = &adapter->hw; | 501 | struct e1000_hw *hw = &adapter->hw; |
491 | uint16_t *eeprom_buff; | 502 | uint16_t *eeprom_buff; |
492 | void *ptr; | 503 | void *ptr; |
@@ -547,7 +558,7 @@ static void | |||
547 | e1000_get_drvinfo(struct net_device *netdev, | 558 | e1000_get_drvinfo(struct net_device *netdev, |
548 | struct ethtool_drvinfo *drvinfo) | 559 | struct ethtool_drvinfo *drvinfo) |
549 | { | 560 | { |
550 | struct e1000_adapter *adapter = netdev->priv; | 561 | struct e1000_adapter *adapter = netdev_priv(netdev); |
551 | 562 | ||
552 | strncpy(drvinfo->driver, e1000_driver_name, 32); | 563 | strncpy(drvinfo->driver, e1000_driver_name, 32); |
553 | strncpy(drvinfo->version, e1000_driver_version, 32); | 564 | strncpy(drvinfo->version, e1000_driver_version, 32); |
@@ -563,7 +574,7 @@ static void | |||
563 | e1000_get_ringparam(struct net_device *netdev, | 574 | e1000_get_ringparam(struct net_device *netdev, |
564 | struct ethtool_ringparam *ring) | 575 | struct ethtool_ringparam *ring) |
565 | { | 576 | { |
566 | struct e1000_adapter *adapter = netdev->priv; | 577 | struct e1000_adapter *adapter = netdev_priv(netdev); |
567 | e1000_mac_type mac_type = adapter->hw.mac_type; | 578 | e1000_mac_type mac_type = adapter->hw.mac_type; |
568 | struct e1000_desc_ring *txdr = &adapter->tx_ring; | 579 | struct e1000_desc_ring *txdr = &adapter->tx_ring; |
569 | struct e1000_desc_ring *rxdr = &adapter->rx_ring; | 580 | struct e1000_desc_ring *rxdr = &adapter->rx_ring; |
@@ -584,7 +595,7 @@ static int | |||
584 | e1000_set_ringparam(struct net_device *netdev, | 595 | e1000_set_ringparam(struct net_device *netdev, |
585 | struct ethtool_ringparam *ring) | 596 | struct ethtool_ringparam *ring) |
586 | { | 597 | { |
587 | struct e1000_adapter *adapter = netdev->priv; | 598 | struct e1000_adapter *adapter = netdev_priv(netdev); |
588 | e1000_mac_type mac_type = adapter->hw.mac_type; | 599 | e1000_mac_type mac_type = adapter->hw.mac_type; |
589 | struct e1000_desc_ring *txdr = &adapter->tx_ring; | 600 | struct e1000_desc_ring *txdr = &adapter->tx_ring; |
590 | struct e1000_desc_ring *rxdr = &adapter->rx_ring; | 601 | struct e1000_desc_ring *rxdr = &adapter->rx_ring; |
@@ -651,6 +662,9 @@ err_setup_rx: | |||
651 | E1000_WRITE_REG(&adapter->hw, R, (test[pat] & W)); \ | 662 | E1000_WRITE_REG(&adapter->hw, R, (test[pat] & W)); \ |
652 | value = E1000_READ_REG(&adapter->hw, R); \ | 663 | value = E1000_READ_REG(&adapter->hw, R); \ |
653 | if(value != (test[pat] & W & M)) { \ | 664 | if(value != (test[pat] & W & M)) { \ |
665 | DPRINTK(DRV, ERR, "pattern test reg %04X failed: got " \ | ||
666 | "0x%08X expected 0x%08X\n", \ | ||
667 | E1000_##R, value, (test[pat] & W & M)); \ | ||
654 | *data = (adapter->hw.mac_type < e1000_82543) ? \ | 668 | *data = (adapter->hw.mac_type < e1000_82543) ? \ |
655 | E1000_82542_##R : E1000_##R; \ | 669 | E1000_82542_##R : E1000_##R; \ |
656 | return 1; \ | 670 | return 1; \ |
@@ -663,7 +677,9 @@ err_setup_rx: | |||
663 | uint32_t value; \ | 677 | uint32_t value; \ |
664 | E1000_WRITE_REG(&adapter->hw, R, W & M); \ | 678 | E1000_WRITE_REG(&adapter->hw, R, W & M); \ |
665 | value = E1000_READ_REG(&adapter->hw, R); \ | 679 | value = E1000_READ_REG(&adapter->hw, R); \ |
666 | if ((W & M) != (value & M)) { \ | 680 | if((W & M) != (value & M)) { \ |
681 | DPRINTK(DRV, ERR, "set/check reg %04X test failed: got 0x%08X "\ | ||
682 | "expected 0x%08X\n", E1000_##R, (value & M), (W & M)); \ | ||
667 | *data = (adapter->hw.mac_type < e1000_82543) ? \ | 683 | *data = (adapter->hw.mac_type < e1000_82543) ? \ |
668 | E1000_82542_##R : E1000_##R; \ | 684 | E1000_82542_##R : E1000_##R; \ |
669 | return 1; \ | 685 | return 1; \ |
@@ -673,18 +689,33 @@ err_setup_rx: | |||
673 | static int | 689 | static int |
674 | e1000_reg_test(struct e1000_adapter *adapter, uint64_t *data) | 690 | e1000_reg_test(struct e1000_adapter *adapter, uint64_t *data) |
675 | { | 691 | { |
676 | uint32_t value; | 692 | uint32_t value, before, after; |
677 | uint32_t i; | 693 | uint32_t i, toggle; |
678 | 694 | ||
679 | /* The status register is Read Only, so a write should fail. | 695 | /* The status register is Read Only, so a write should fail. |
680 | * Some bits that get toggled are ignored. | 696 | * Some bits that get toggled are ignored. |
681 | */ | 697 | */ |
682 | value = (E1000_READ_REG(&adapter->hw, STATUS) & (0xFFFFF833)); | 698 | switch (adapter->hw.mac_type) { |
683 | E1000_WRITE_REG(&adapter->hw, STATUS, (0xFFFFFFFF)); | 699 | case e1000_82573: |
684 | if(value != (E1000_READ_REG(&adapter->hw, STATUS) & (0xFFFFF833))) { | 700 | toggle = 0x7FFFF033; |
701 | break; | ||
702 | default: | ||
703 | toggle = 0xFFFFF833; | ||
704 | break; | ||
705 | } | ||
706 | |||
707 | before = E1000_READ_REG(&adapter->hw, STATUS); | ||
708 | value = (E1000_READ_REG(&adapter->hw, STATUS) & toggle); | ||
709 | E1000_WRITE_REG(&adapter->hw, STATUS, toggle); | ||
710 | after = E1000_READ_REG(&adapter->hw, STATUS) & toggle; | ||
711 | if(value != after) { | ||
712 | DPRINTK(DRV, ERR, "failed STATUS register test got: " | ||
713 | "0x%08X expected: 0x%08X\n", after, value); | ||
685 | *data = 1; | 714 | *data = 1; |
686 | return 1; | 715 | return 1; |
687 | } | 716 | } |
717 | /* restore previous status */ | ||
718 | E1000_WRITE_REG(&adapter->hw, STATUS, before); | ||
688 | 719 | ||
689 | REG_PATTERN_TEST(FCAL, 0xFFFFFFFF, 0xFFFFFFFF); | 720 | REG_PATTERN_TEST(FCAL, 0xFFFFFFFF, 0xFFFFFFFF); |
690 | REG_PATTERN_TEST(FCAH, 0x0000FFFF, 0xFFFFFFFF); | 721 | REG_PATTERN_TEST(FCAH, 0x0000FFFF, 0xFFFFFFFF); |
@@ -766,7 +797,7 @@ e1000_test_intr(int irq, | |||
766 | struct pt_regs *regs) | 797 | struct pt_regs *regs) |
767 | { | 798 | { |
768 | struct net_device *netdev = (struct net_device *) data; | 799 | struct net_device *netdev = (struct net_device *) data; |
769 | struct e1000_adapter *adapter = netdev->priv; | 800 | struct e1000_adapter *adapter = netdev_priv(netdev); |
770 | 801 | ||
771 | adapter->test_icr |= E1000_READ_REG(&adapter->hw, ICR); | 802 | adapter->test_icr |= E1000_READ_REG(&adapter->hw, ICR); |
772 | 803 | ||
@@ -1214,6 +1245,7 @@ e1000_set_phy_loopback(struct e1000_adapter *adapter) | |||
1214 | case e1000_82541_rev_2: | 1245 | case e1000_82541_rev_2: |
1215 | case e1000_82547: | 1246 | case e1000_82547: |
1216 | case e1000_82547_rev_2: | 1247 | case e1000_82547_rev_2: |
1248 | case e1000_82573: | ||
1217 | return e1000_integrated_phy_loopback(adapter); | 1249 | return e1000_integrated_phy_loopback(adapter); |
1218 | break; | 1250 | break; |
1219 | 1251 | ||
@@ -1422,7 +1454,7 @@ static void | |||
1422 | e1000_diag_test(struct net_device *netdev, | 1454 | e1000_diag_test(struct net_device *netdev, |
1423 | struct ethtool_test *eth_test, uint64_t *data) | 1455 | struct ethtool_test *eth_test, uint64_t *data) |
1424 | { | 1456 | { |
1425 | struct e1000_adapter *adapter = netdev->priv; | 1457 | struct e1000_adapter *adapter = netdev_priv(netdev); |
1426 | boolean_t if_running = netif_running(netdev); | 1458 | boolean_t if_running = netif_running(netdev); |
1427 | 1459 | ||
1428 | if(eth_test->flags == ETH_TEST_FL_OFFLINE) { | 1460 | if(eth_test->flags == ETH_TEST_FL_OFFLINE) { |
@@ -1482,7 +1514,7 @@ e1000_diag_test(struct net_device *netdev, | |||
1482 | static void | 1514 | static void |
1483 | e1000_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) | 1515 | e1000_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) |
1484 | { | 1516 | { |
1485 | struct e1000_adapter *adapter = netdev->priv; | 1517 | struct e1000_adapter *adapter = netdev_priv(netdev); |
1486 | struct e1000_hw *hw = &adapter->hw; | 1518 | struct e1000_hw *hw = &adapter->hw; |
1487 | 1519 | ||
1488 | switch(adapter->hw.device_id) { | 1520 | switch(adapter->hw.device_id) { |
@@ -1527,7 +1559,7 @@ e1000_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) | |||
1527 | static int | 1559 | static int |
1528 | e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) | 1560 | e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) |
1529 | { | 1561 | { |
1530 | struct e1000_adapter *adapter = netdev->priv; | 1562 | struct e1000_adapter *adapter = netdev_priv(netdev); |
1531 | struct e1000_hw *hw = &adapter->hw; | 1563 | struct e1000_hw *hw = &adapter->hw; |
1532 | 1564 | ||
1533 | switch(adapter->hw.device_id) { | 1565 | switch(adapter->hw.device_id) { |
@@ -1588,22 +1620,31 @@ e1000_led_blink_callback(unsigned long data) | |||
1588 | static int | 1620 | static int |
1589 | e1000_phys_id(struct net_device *netdev, uint32_t data) | 1621 | e1000_phys_id(struct net_device *netdev, uint32_t data) |
1590 | { | 1622 | { |
1591 | struct e1000_adapter *adapter = netdev->priv; | 1623 | struct e1000_adapter *adapter = netdev_priv(netdev); |
1592 | 1624 | ||
1593 | if(!data || data > (uint32_t)(MAX_SCHEDULE_TIMEOUT / HZ)) | 1625 | if(!data || data > (uint32_t)(MAX_SCHEDULE_TIMEOUT / HZ)) |
1594 | data = (uint32_t)(MAX_SCHEDULE_TIMEOUT / HZ); | 1626 | data = (uint32_t)(MAX_SCHEDULE_TIMEOUT / HZ); |
1595 | 1627 | ||
1596 | if(!adapter->blink_timer.function) { | 1628 | if(adapter->hw.mac_type < e1000_82573) { |
1597 | init_timer(&adapter->blink_timer); | 1629 | if(!adapter->blink_timer.function) { |
1598 | adapter->blink_timer.function = e1000_led_blink_callback; | 1630 | init_timer(&adapter->blink_timer); |
1599 | adapter->blink_timer.data = (unsigned long) adapter; | 1631 | adapter->blink_timer.function = e1000_led_blink_callback; |
1632 | adapter->blink_timer.data = (unsigned long) adapter; | ||
1633 | } | ||
1634 | e1000_setup_led(&adapter->hw); | ||
1635 | mod_timer(&adapter->blink_timer, jiffies); | ||
1636 | msleep_interruptible(data * 1000); | ||
1637 | del_timer_sync(&adapter->blink_timer); | ||
1638 | } | ||
1639 | else { | ||
1640 | E1000_WRITE_REG(&adapter->hw, LEDCTL, (E1000_LEDCTL_LED2_BLINK_RATE | | ||
1641 | E1000_LEDCTL_LED1_BLINK | E1000_LEDCTL_LED2_BLINK | | ||
1642 | (E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED2_MODE_SHIFT) | | ||
1643 | (E1000_LEDCTL_MODE_LINK_ACTIVITY << E1000_LEDCTL_LED1_MODE_SHIFT) | | ||
1644 | (E1000_LEDCTL_MODE_LED_OFF << E1000_LEDCTL_LED0_MODE_SHIFT))); | ||
1645 | msleep_interruptible(data * 1000); | ||
1600 | } | 1646 | } |
1601 | 1647 | ||
1602 | e1000_setup_led(&adapter->hw); | ||
1603 | mod_timer(&adapter->blink_timer, jiffies); | ||
1604 | |||
1605 | msleep_interruptible(data * 1000); | ||
1606 | del_timer_sync(&adapter->blink_timer); | ||
1607 | e1000_led_off(&adapter->hw); | 1648 | e1000_led_off(&adapter->hw); |
1608 | clear_bit(E1000_LED_ON, &adapter->led_status); | 1649 | clear_bit(E1000_LED_ON, &adapter->led_status); |
1609 | e1000_cleanup_led(&adapter->hw); | 1650 | e1000_cleanup_led(&adapter->hw); |
@@ -1614,7 +1655,7 @@ e1000_phys_id(struct net_device *netdev, uint32_t data) | |||
1614 | static int | 1655 | static int |
1615 | e1000_nway_reset(struct net_device *netdev) | 1656 | e1000_nway_reset(struct net_device *netdev) |
1616 | { | 1657 | { |
1617 | struct e1000_adapter *adapter = netdev->priv; | 1658 | struct e1000_adapter *adapter = netdev_priv(netdev); |
1618 | if(netif_running(netdev)) { | 1659 | if(netif_running(netdev)) { |
1619 | e1000_down(adapter); | 1660 | e1000_down(adapter); |
1620 | e1000_up(adapter); | 1661 | e1000_up(adapter); |
@@ -1632,7 +1673,7 @@ static void | |||
1632 | e1000_get_ethtool_stats(struct net_device *netdev, | 1673 | e1000_get_ethtool_stats(struct net_device *netdev, |
1633 | struct ethtool_stats *stats, uint64_t *data) | 1674 | struct ethtool_stats *stats, uint64_t *data) |
1634 | { | 1675 | { |
1635 | struct e1000_adapter *adapter = netdev->priv; | 1676 | struct e1000_adapter *adapter = netdev_priv(netdev); |
1636 | int i; | 1677 | int i; |
1637 | 1678 | ||
1638 | e1000_update_stats(adapter); | 1679 | e1000_update_stats(adapter); |
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c index 723589b28be5..045f5426ab9a 100644 --- a/drivers/net/e1000/e1000_hw.c +++ b/drivers/net/e1000/e1000_hw.c | |||
@@ -354,18 +354,27 @@ e1000_set_media_type(struct e1000_hw *hw) | |||
354 | hw->media_type = e1000_media_type_internal_serdes; | 354 | hw->media_type = e1000_media_type_internal_serdes; |
355 | break; | 355 | break; |
356 | default: | 356 | default: |
357 | if(hw->mac_type >= e1000_82543) { | 357 | switch (hw->mac_type) { |
358 | case e1000_82542_rev2_0: | ||
359 | case e1000_82542_rev2_1: | ||
360 | hw->media_type = e1000_media_type_fiber; | ||
361 | break; | ||
362 | case e1000_82573: | ||
363 | /* The STATUS_TBIMODE bit is reserved or reused for the this | ||
364 | * device. | ||
365 | */ | ||
366 | hw->media_type = e1000_media_type_copper; | ||
367 | break; | ||
368 | default: | ||
358 | status = E1000_READ_REG(hw, STATUS); | 369 | status = E1000_READ_REG(hw, STATUS); |
359 | if(status & E1000_STATUS_TBIMODE) { | 370 | if (status & E1000_STATUS_TBIMODE) { |
360 | hw->media_type = e1000_media_type_fiber; | 371 | hw->media_type = e1000_media_type_fiber; |
361 | /* tbi_compatibility not valid on fiber */ | 372 | /* tbi_compatibility not valid on fiber */ |
362 | hw->tbi_compatibility_en = FALSE; | 373 | hw->tbi_compatibility_en = FALSE; |
363 | } else { | 374 | } else { |
364 | hw->media_type = e1000_media_type_copper; | 375 | hw->media_type = e1000_media_type_copper; |
365 | } | 376 | } |
366 | } else { | 377 | break; |
367 | /* This is an 82542 (fiber only) */ | ||
368 | hw->media_type = e1000_media_type_fiber; | ||
369 | } | 378 | } |
370 | } | 379 | } |
371 | } | 380 | } |
@@ -1189,9 +1198,9 @@ e1000_copper_link_igp_setup(struct e1000_hw *hw) | |||
1189 | ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL, phy_data); | 1198 | ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL, phy_data); |
1190 | if(ret_val) | 1199 | if(ret_val) |
1191 | return ret_val; | 1200 | return ret_val; |
1192 | } | 1201 | } |
1193 | 1202 | ||
1194 | return E1000_SUCCESS; | 1203 | return E1000_SUCCESS; |
1195 | } | 1204 | } |
1196 | 1205 | ||
1197 | 1206 | ||
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h index a0263ee96c6b..93e9f8788751 100644 --- a/drivers/net/e1000/e1000_hw.h +++ b/drivers/net/e1000/e1000_hw.h | |||
@@ -66,6 +66,7 @@ typedef enum { | |||
66 | e1000_eeprom_spi, | 66 | e1000_eeprom_spi, |
67 | e1000_eeprom_microwire, | 67 | e1000_eeprom_microwire, |
68 | e1000_eeprom_flash, | 68 | e1000_eeprom_flash, |
69 | e1000_eeprom_none, /* No NVM support */ | ||
69 | e1000_num_eeprom_types | 70 | e1000_num_eeprom_types |
70 | } e1000_eeprom_type; | 71 | } e1000_eeprom_type; |
71 | 72 | ||
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 137226d98d47..cb7f051a60ad 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -29,6 +29,8 @@ | |||
29 | #include "e1000.h" | 29 | #include "e1000.h" |
30 | 30 | ||
31 | /* Change Log | 31 | /* Change Log |
32 | * 6.0.58 4/20/05 | ||
33 | * o Accepted ethtool cleanup patch from Stephen Hemminger | ||
32 | * 6.0.44+ 2/15/05 | 34 | * 6.0.44+ 2/15/05 |
33 | * o applied Anton's patch to resolve tx hang in hardware | 35 | * o applied Anton's patch to resolve tx hang in hardware |
34 | * o Applied Andrew Mortons patch - e1000 stops working after resume | 36 | * o Applied Andrew Mortons patch - e1000 stops working after resume |
@@ -41,9 +43,9 @@ char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver"; | |||
41 | #else | 43 | #else |
42 | #define DRIVERNAPI "-NAPI" | 44 | #define DRIVERNAPI "-NAPI" |
43 | #endif | 45 | #endif |
44 | #define DRV_VERSION "6.0.54-k2"DRIVERNAPI | 46 | #define DRV_VERSION "6.0.60-k2"DRIVERNAPI |
45 | char e1000_driver_version[] = DRV_VERSION; | 47 | char e1000_driver_version[] = DRV_VERSION; |
46 | char e1000_copyright[] = "Copyright (c) 1999-2004 Intel Corporation."; | 48 | char e1000_copyright[] = "Copyright (c) 1999-2005 Intel Corporation."; |
47 | 49 | ||
48 | /* e1000_pci_tbl - PCI Device ID Table | 50 | /* e1000_pci_tbl - PCI Device ID Table |
49 | * | 51 | * |
@@ -517,7 +519,7 @@ e1000_probe(struct pci_dev *pdev, | |||
517 | SET_NETDEV_DEV(netdev, &pdev->dev); | 519 | SET_NETDEV_DEV(netdev, &pdev->dev); |
518 | 520 | ||
519 | pci_set_drvdata(pdev, netdev); | 521 | pci_set_drvdata(pdev, netdev); |
520 | adapter = netdev->priv; | 522 | adapter = netdev_priv(netdev); |
521 | adapter->netdev = netdev; | 523 | adapter->netdev = netdev; |
522 | adapter->pdev = pdev; | 524 | adapter->pdev = pdev; |
523 | adapter->hw.back = adapter; | 525 | adapter->hw.back = adapter; |
@@ -738,7 +740,7 @@ static void __devexit | |||
738 | e1000_remove(struct pci_dev *pdev) | 740 | e1000_remove(struct pci_dev *pdev) |
739 | { | 741 | { |
740 | struct net_device *netdev = pci_get_drvdata(pdev); | 742 | struct net_device *netdev = pci_get_drvdata(pdev); |
741 | struct e1000_adapter *adapter = netdev->priv; | 743 | struct e1000_adapter *adapter = netdev_priv(netdev); |
742 | uint32_t manc, swsm; | 744 | uint32_t manc, swsm; |
743 | 745 | ||
744 | flush_scheduled_work(); | 746 | flush_scheduled_work(); |
@@ -871,7 +873,7 @@ e1000_sw_init(struct e1000_adapter *adapter) | |||
871 | static int | 873 | static int |
872 | e1000_open(struct net_device *netdev) | 874 | e1000_open(struct net_device *netdev) |
873 | { | 875 | { |
874 | struct e1000_adapter *adapter = netdev->priv; | 876 | struct e1000_adapter *adapter = netdev_priv(netdev); |
875 | int err; | 877 | int err; |
876 | 878 | ||
877 | /* allocate transmit descriptors */ | 879 | /* allocate transmit descriptors */ |
@@ -919,7 +921,7 @@ err_setup_tx: | |||
919 | static int | 921 | static int |
920 | e1000_close(struct net_device *netdev) | 922 | e1000_close(struct net_device *netdev) |
921 | { | 923 | { |
922 | struct e1000_adapter *adapter = netdev->priv; | 924 | struct e1000_adapter *adapter = netdev_priv(netdev); |
923 | 925 | ||
924 | e1000_down(adapter); | 926 | e1000_down(adapter); |
925 | 927 | ||
@@ -1599,7 +1601,7 @@ e1000_leave_82542_rst(struct e1000_adapter *adapter) | |||
1599 | static int | 1601 | static int |
1600 | e1000_set_mac(struct net_device *netdev, void *p) | 1602 | e1000_set_mac(struct net_device *netdev, void *p) |
1601 | { | 1603 | { |
1602 | struct e1000_adapter *adapter = netdev->priv; | 1604 | struct e1000_adapter *adapter = netdev_priv(netdev); |
1603 | struct sockaddr *addr = p; | 1605 | struct sockaddr *addr = p; |
1604 | 1606 | ||
1605 | if(!is_valid_ether_addr(addr->sa_data)) | 1607 | if(!is_valid_ether_addr(addr->sa_data)) |
@@ -1634,7 +1636,7 @@ e1000_set_mac(struct net_device *netdev, void *p) | |||
1634 | static void | 1636 | static void |
1635 | e1000_set_multi(struct net_device *netdev) | 1637 | e1000_set_multi(struct net_device *netdev) |
1636 | { | 1638 | { |
1637 | struct e1000_adapter *adapter = netdev->priv; | 1639 | struct e1000_adapter *adapter = netdev_priv(netdev); |
1638 | struct e1000_hw *hw = &adapter->hw; | 1640 | struct e1000_hw *hw = &adapter->hw; |
1639 | struct dev_mc_list *mc_ptr; | 1641 | struct dev_mc_list *mc_ptr; |
1640 | unsigned long flags; | 1642 | unsigned long flags; |
@@ -2213,7 +2215,7 @@ e1000_transfer_dhcp_info(struct e1000_adapter *adapter, struct sk_buff *skb) | |||
2213 | static int | 2215 | static int |
2214 | e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | 2216 | e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) |
2215 | { | 2217 | { |
2216 | struct e1000_adapter *adapter = netdev->priv; | 2218 | struct e1000_adapter *adapter = netdev_priv(netdev); |
2217 | unsigned int first, max_per_txd = E1000_MAX_DATA_PER_TXD; | 2219 | unsigned int first, max_per_txd = E1000_MAX_DATA_PER_TXD; |
2218 | unsigned int max_txd_pwr = E1000_MAX_TXD_PWR; | 2220 | unsigned int max_txd_pwr = E1000_MAX_TXD_PWR; |
2219 | unsigned int tx_flags = 0; | 2221 | unsigned int tx_flags = 0; |
@@ -2344,7 +2346,7 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
2344 | static void | 2346 | static void |
2345 | e1000_tx_timeout(struct net_device *netdev) | 2347 | e1000_tx_timeout(struct net_device *netdev) |
2346 | { | 2348 | { |
2347 | struct e1000_adapter *adapter = netdev->priv; | 2349 | struct e1000_adapter *adapter = netdev_priv(netdev); |
2348 | 2350 | ||
2349 | /* Do the reset outside of interrupt context */ | 2351 | /* Do the reset outside of interrupt context */ |
2350 | schedule_work(&adapter->tx_timeout_task); | 2352 | schedule_work(&adapter->tx_timeout_task); |
@@ -2353,7 +2355,7 @@ e1000_tx_timeout(struct net_device *netdev) | |||
2353 | static void | 2355 | static void |
2354 | e1000_tx_timeout_task(struct net_device *netdev) | 2356 | e1000_tx_timeout_task(struct net_device *netdev) |
2355 | { | 2357 | { |
2356 | struct e1000_adapter *adapter = netdev->priv; | 2358 | struct e1000_adapter *adapter = netdev_priv(netdev); |
2357 | 2359 | ||
2358 | e1000_down(adapter); | 2360 | e1000_down(adapter); |
2359 | e1000_up(adapter); | 2361 | e1000_up(adapter); |
@@ -2370,7 +2372,7 @@ e1000_tx_timeout_task(struct net_device *netdev) | |||
2370 | static struct net_device_stats * | 2372 | static struct net_device_stats * |
2371 | e1000_get_stats(struct net_device *netdev) | 2373 | e1000_get_stats(struct net_device *netdev) |
2372 | { | 2374 | { |
2373 | struct e1000_adapter *adapter = netdev->priv; | 2375 | struct e1000_adapter *adapter = netdev_priv(netdev); |
2374 | 2376 | ||
2375 | e1000_update_stats(adapter); | 2377 | e1000_update_stats(adapter); |
2376 | return &adapter->net_stats; | 2378 | return &adapter->net_stats; |
@@ -2387,7 +2389,7 @@ e1000_get_stats(struct net_device *netdev) | |||
2387 | static int | 2389 | static int |
2388 | e1000_change_mtu(struct net_device *netdev, int new_mtu) | 2390 | e1000_change_mtu(struct net_device *netdev, int new_mtu) |
2389 | { | 2391 | { |
2390 | struct e1000_adapter *adapter = netdev->priv; | 2392 | struct e1000_adapter *adapter = netdev_priv(netdev); |
2391 | int max_frame = new_mtu + ENET_HEADER_SIZE + ETHERNET_FCS_SIZE; | 2393 | int max_frame = new_mtu + ENET_HEADER_SIZE + ETHERNET_FCS_SIZE; |
2392 | 2394 | ||
2393 | if((max_frame < MINIMUM_ETHERNET_FRAME_SIZE) || | 2395 | if((max_frame < MINIMUM_ETHERNET_FRAME_SIZE) || |
@@ -2598,7 +2600,7 @@ static irqreturn_t | |||
2598 | e1000_intr(int irq, void *data, struct pt_regs *regs) | 2600 | e1000_intr(int irq, void *data, struct pt_regs *regs) |
2599 | { | 2601 | { |
2600 | struct net_device *netdev = data; | 2602 | struct net_device *netdev = data; |
2601 | struct e1000_adapter *adapter = netdev->priv; | 2603 | struct e1000_adapter *adapter = netdev_priv(netdev); |
2602 | struct e1000_hw *hw = &adapter->hw; | 2604 | struct e1000_hw *hw = &adapter->hw; |
2603 | uint32_t icr = E1000_READ_REG(hw, ICR); | 2605 | uint32_t icr = E1000_READ_REG(hw, ICR); |
2604 | #ifndef CONFIG_E1000_NAPI | 2606 | #ifndef CONFIG_E1000_NAPI |
@@ -2661,7 +2663,7 @@ e1000_intr(int irq, void *data, struct pt_regs *regs) | |||
2661 | static int | 2663 | static int |
2662 | e1000_clean(struct net_device *netdev, int *budget) | 2664 | e1000_clean(struct net_device *netdev, int *budget) |
2663 | { | 2665 | { |
2664 | struct e1000_adapter *adapter = netdev->priv; | 2666 | struct e1000_adapter *adapter = netdev_priv(netdev); |
2665 | int work_to_do = min(*budget, netdev->quota); | 2667 | int work_to_do = min(*budget, netdev->quota); |
2666 | int tx_cleaned; | 2668 | int tx_cleaned; |
2667 | int work_done = 0; | 2669 | int work_done = 0; |
@@ -2672,8 +2674,8 @@ e1000_clean(struct net_device *netdev, int *budget) | |||
2672 | *budget -= work_done; | 2674 | *budget -= work_done; |
2673 | netdev->quota -= work_done; | 2675 | netdev->quota -= work_done; |
2674 | 2676 | ||
2675 | /* If no Tx and no Rx work done, exit the polling mode */ | ||
2676 | if ((!tx_cleaned && (work_done == 0)) || !netif_running(netdev)) { | 2677 | if ((!tx_cleaned && (work_done == 0)) || !netif_running(netdev)) { |
2678 | /* If no Tx and not enough Rx work done, exit the polling mode */ | ||
2677 | netif_rx_complete(netdev); | 2679 | netif_rx_complete(netdev); |
2678 | e1000_irq_enable(adapter); | 2680 | e1000_irq_enable(adapter); |
2679 | return 0; | 2681 | return 0; |
@@ -2769,13 +2771,13 @@ e1000_clean_tx_irq(struct e1000_adapter *adapter) | |||
2769 | i = tx_ring->next_to_clean; | 2771 | i = tx_ring->next_to_clean; |
2770 | eop = tx_ring->buffer_info[i].next_to_watch; | 2772 | eop = tx_ring->buffer_info[i].next_to_watch; |
2771 | eop_desc = E1000_TX_DESC(*tx_ring, eop); | 2773 | eop_desc = E1000_TX_DESC(*tx_ring, eop); |
2772 | DPRINTK(TX_ERR, ERR, "Detected Tx Unit Hang\n" | 2774 | DPRINTK(DRV, ERR, "Detected Tx Unit Hang\n" |
2773 | " TDH <%x>\n" | 2775 | " TDH <%x>\n" |
2774 | " TDT <%x>\n" | 2776 | " TDT <%x>\n" |
2775 | " next_to_use <%x>\n" | 2777 | " next_to_use <%x>\n" |
2776 | " next_to_clean <%x>\n" | 2778 | " next_to_clean <%x>\n" |
2777 | "buffer_info[next_to_clean]\n" | 2779 | "buffer_info[next_to_clean]\n" |
2778 | " dma <%llx>\n" | 2780 | " dma <%zx>\n" |
2779 | " time_stamp <%lx>\n" | 2781 | " time_stamp <%lx>\n" |
2780 | " next_to_watch <%x>\n" | 2782 | " next_to_watch <%x>\n" |
2781 | " jiffies <%lx>\n" | 2783 | " jiffies <%lx>\n" |
@@ -2994,7 +2996,7 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter) | |||
2994 | 2996 | ||
2995 | i = rx_ring->next_to_clean; | 2997 | i = rx_ring->next_to_clean; |
2996 | rx_desc = E1000_RX_DESC_PS(*rx_ring, i); | 2998 | rx_desc = E1000_RX_DESC_PS(*rx_ring, i); |
2997 | staterr = rx_desc->wb.middle.status_error; | 2999 | staterr = le32_to_cpu(rx_desc->wb.middle.status_error); |
2998 | 3000 | ||
2999 | while(staterr & E1000_RXD_STAT_DD) { | 3001 | while(staterr & E1000_RXD_STAT_DD) { |
3000 | buffer_info = &rx_ring->buffer_info[i]; | 3002 | buffer_info = &rx_ring->buffer_info[i]; |
@@ -3065,16 +3067,16 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter) | |||
3065 | #ifdef CONFIG_E1000_NAPI | 3067 | #ifdef CONFIG_E1000_NAPI |
3066 | if(unlikely(adapter->vlgrp && (staterr & E1000_RXD_STAT_VP))) { | 3068 | if(unlikely(adapter->vlgrp && (staterr & E1000_RXD_STAT_VP))) { |
3067 | vlan_hwaccel_receive_skb(skb, adapter->vlgrp, | 3069 | vlan_hwaccel_receive_skb(skb, adapter->vlgrp, |
3068 | le16_to_cpu(rx_desc->wb.middle.vlan & | 3070 | le16_to_cpu(rx_desc->wb.middle.vlan) & |
3069 | E1000_RXD_SPC_VLAN_MASK)); | 3071 | E1000_RXD_SPC_VLAN_MASK); |
3070 | } else { | 3072 | } else { |
3071 | netif_receive_skb(skb); | 3073 | netif_receive_skb(skb); |
3072 | } | 3074 | } |
3073 | #else /* CONFIG_E1000_NAPI */ | 3075 | #else /* CONFIG_E1000_NAPI */ |
3074 | if(unlikely(adapter->vlgrp && (staterr & E1000_RXD_STAT_VP))) { | 3076 | if(unlikely(adapter->vlgrp && (staterr & E1000_RXD_STAT_VP))) { |
3075 | vlan_hwaccel_rx(skb, adapter->vlgrp, | 3077 | vlan_hwaccel_rx(skb, adapter->vlgrp, |
3076 | le16_to_cpu(rx_desc->wb.middle.vlan & | 3078 | le16_to_cpu(rx_desc->wb.middle.vlan) & |
3077 | E1000_RXD_SPC_VLAN_MASK)); | 3079 | E1000_RXD_SPC_VLAN_MASK); |
3078 | } else { | 3080 | } else { |
3079 | netif_rx(skb); | 3081 | netif_rx(skb); |
3080 | } | 3082 | } |
@@ -3087,7 +3089,7 @@ next_desc: | |||
3087 | if(unlikely(++i == rx_ring->count)) i = 0; | 3089 | if(unlikely(++i == rx_ring->count)) i = 0; |
3088 | 3090 | ||
3089 | rx_desc = E1000_RX_DESC_PS(*rx_ring, i); | 3091 | rx_desc = E1000_RX_DESC_PS(*rx_ring, i); |
3090 | staterr = rx_desc->wb.middle.status_error; | 3092 | staterr = le32_to_cpu(rx_desc->wb.middle.status_error); |
3091 | } | 3093 | } |
3092 | rx_ring->next_to_clean = i; | 3094 | rx_ring->next_to_clean = i; |
3093 | adapter->alloc_rx_buf(adapter); | 3095 | adapter->alloc_rx_buf(adapter); |
@@ -3371,11 +3373,12 @@ e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | |||
3371 | static int | 3373 | static int |
3372 | e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | 3374 | e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) |
3373 | { | 3375 | { |
3374 | struct e1000_adapter *adapter = netdev->priv; | 3376 | struct e1000_adapter *adapter = netdev_priv(netdev); |
3375 | struct mii_ioctl_data *data = if_mii(ifr); | 3377 | struct mii_ioctl_data *data = if_mii(ifr); |
3376 | int retval; | 3378 | int retval; |
3377 | uint16_t mii_reg; | 3379 | uint16_t mii_reg; |
3378 | uint16_t spddplx; | 3380 | uint16_t spddplx; |
3381 | unsigned long flags; | ||
3379 | 3382 | ||
3380 | if(adapter->hw.media_type != e1000_media_type_copper) | 3383 | if(adapter->hw.media_type != e1000_media_type_copper) |
3381 | return -EOPNOTSUPP; | 3384 | return -EOPNOTSUPP; |
@@ -3385,22 +3388,29 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | |||
3385 | data->phy_id = adapter->hw.phy_addr; | 3388 | data->phy_id = adapter->hw.phy_addr; |
3386 | break; | 3389 | break; |
3387 | case SIOCGMIIREG: | 3390 | case SIOCGMIIREG: |
3388 | if (!capable(CAP_NET_ADMIN)) | 3391 | if(!capable(CAP_NET_ADMIN)) |
3389 | return -EPERM; | 3392 | return -EPERM; |
3390 | if (e1000_read_phy_reg(&adapter->hw, data->reg_num & 0x1F, | 3393 | spin_lock_irqsave(&adapter->stats_lock, flags); |
3391 | &data->val_out)) | 3394 | if(e1000_read_phy_reg(&adapter->hw, data->reg_num & 0x1F, |
3395 | &data->val_out)) { | ||
3396 | spin_unlock_irqrestore(&adapter->stats_lock, flags); | ||
3392 | return -EIO; | 3397 | return -EIO; |
3398 | } | ||
3399 | spin_unlock_irqrestore(&adapter->stats_lock, flags); | ||
3393 | break; | 3400 | break; |
3394 | case SIOCSMIIREG: | 3401 | case SIOCSMIIREG: |
3395 | if (!capable(CAP_NET_ADMIN)) | 3402 | if(!capable(CAP_NET_ADMIN)) |
3396 | return -EPERM; | 3403 | return -EPERM; |
3397 | if (data->reg_num & ~(0x1F)) | 3404 | if(data->reg_num & ~(0x1F)) |
3398 | return -EFAULT; | 3405 | return -EFAULT; |
3399 | mii_reg = data->val_in; | 3406 | mii_reg = data->val_in; |
3400 | if (e1000_write_phy_reg(&adapter->hw, data->reg_num, | 3407 | spin_lock_irqsave(&adapter->stats_lock, flags); |
3401 | mii_reg)) | 3408 | if(e1000_write_phy_reg(&adapter->hw, data->reg_num, |
3409 | mii_reg)) { | ||
3410 | spin_unlock_irqrestore(&adapter->stats_lock, flags); | ||
3402 | return -EIO; | 3411 | return -EIO; |
3403 | if (adapter->hw.phy_type == e1000_phy_m88) { | 3412 | } |
3413 | if(adapter->hw.phy_type == e1000_phy_m88) { | ||
3404 | switch (data->reg_num) { | 3414 | switch (data->reg_num) { |
3405 | case PHY_CTRL: | 3415 | case PHY_CTRL: |
3406 | if(mii_reg & MII_CR_POWER_DOWN) | 3416 | if(mii_reg & MII_CR_POWER_DOWN) |
@@ -3420,8 +3430,12 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | |||
3420 | HALF_DUPLEX; | 3430 | HALF_DUPLEX; |
3421 | retval = e1000_set_spd_dplx(adapter, | 3431 | retval = e1000_set_spd_dplx(adapter, |
3422 | spddplx); | 3432 | spddplx); |
3423 | if(retval) | 3433 | if(retval) { |
3434 | spin_unlock_irqrestore( | ||
3435 | &adapter->stats_lock, | ||
3436 | flags); | ||
3424 | return retval; | 3437 | return retval; |
3438 | } | ||
3425 | } | 3439 | } |
3426 | if(netif_running(adapter->netdev)) { | 3440 | if(netif_running(adapter->netdev)) { |
3427 | e1000_down(adapter); | 3441 | e1000_down(adapter); |
@@ -3431,8 +3445,11 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | |||
3431 | break; | 3445 | break; |
3432 | case M88E1000_PHY_SPEC_CTRL: | 3446 | case M88E1000_PHY_SPEC_CTRL: |
3433 | case M88E1000_EXT_PHY_SPEC_CTRL: | 3447 | case M88E1000_EXT_PHY_SPEC_CTRL: |
3434 | if (e1000_phy_reset(&adapter->hw)) | 3448 | if(e1000_phy_reset(&adapter->hw)) { |
3449 | spin_unlock_irqrestore( | ||
3450 | &adapter->stats_lock, flags); | ||
3435 | return -EIO; | 3451 | return -EIO; |
3452 | } | ||
3436 | break; | 3453 | break; |
3437 | } | 3454 | } |
3438 | } else { | 3455 | } else { |
@@ -3448,6 +3465,7 @@ e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) | |||
3448 | break; | 3465 | break; |
3449 | } | 3466 | } |
3450 | } | 3467 | } |
3468 | spin_unlock_irqrestore(&adapter->stats_lock, flags); | ||
3451 | break; | 3469 | break; |
3452 | default: | 3470 | default: |
3453 | return -EOPNOTSUPP; | 3471 | return -EOPNOTSUPP; |
@@ -3504,7 +3522,7 @@ e1000_io_write(struct e1000_hw *hw, unsigned long port, uint32_t value) | |||
3504 | static void | 3522 | static void |
3505 | e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp) | 3523 | e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp) |
3506 | { | 3524 | { |
3507 | struct e1000_adapter *adapter = netdev->priv; | 3525 | struct e1000_adapter *adapter = netdev_priv(netdev); |
3508 | uint32_t ctrl, rctl; | 3526 | uint32_t ctrl, rctl; |
3509 | 3527 | ||
3510 | e1000_irq_disable(adapter); | 3528 | e1000_irq_disable(adapter); |
@@ -3544,7 +3562,7 @@ e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp) | |||
3544 | static void | 3562 | static void |
3545 | e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid) | 3563 | e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid) |
3546 | { | 3564 | { |
3547 | struct e1000_adapter *adapter = netdev->priv; | 3565 | struct e1000_adapter *adapter = netdev_priv(netdev); |
3548 | uint32_t vfta, index; | 3566 | uint32_t vfta, index; |
3549 | if((adapter->hw.mng_cookie.status & | 3567 | if((adapter->hw.mng_cookie.status & |
3550 | E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) && | 3568 | E1000_MNG_DHCP_COOKIE_STATUS_VLAN_SUPPORT) && |
@@ -3560,7 +3578,7 @@ e1000_vlan_rx_add_vid(struct net_device *netdev, uint16_t vid) | |||
3560 | static void | 3578 | static void |
3561 | e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid) | 3579 | e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid) |
3562 | { | 3580 | { |
3563 | struct e1000_adapter *adapter = netdev->priv; | 3581 | struct e1000_adapter *adapter = netdev_priv(netdev); |
3564 | uint32_t vfta, index; | 3582 | uint32_t vfta, index; |
3565 | 3583 | ||
3566 | e1000_irq_disable(adapter); | 3584 | e1000_irq_disable(adapter); |
@@ -3601,6 +3619,13 @@ e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx) | |||
3601 | { | 3619 | { |
3602 | adapter->hw.autoneg = 0; | 3620 | adapter->hw.autoneg = 0; |
3603 | 3621 | ||
3622 | /* Fiber NICs only allow 1000 gbps Full duplex */ | ||
3623 | if((adapter->hw.media_type == e1000_media_type_fiber) && | ||
3624 | spddplx != (SPEED_1000 + DUPLEX_FULL)) { | ||
3625 | DPRINTK(PROBE, ERR, "Unsupported Speed/Duplex configuration\n"); | ||
3626 | return -EINVAL; | ||
3627 | } | ||
3628 | |||
3604 | switch(spddplx) { | 3629 | switch(spddplx) { |
3605 | case SPEED_10 + DUPLEX_HALF: | 3630 | case SPEED_10 + DUPLEX_HALF: |
3606 | adapter->hw.forced_speed_duplex = e1000_10_half; | 3631 | adapter->hw.forced_speed_duplex = e1000_10_half; |
@@ -3647,7 +3672,7 @@ static int | |||
3647 | e1000_suspend(struct pci_dev *pdev, uint32_t state) | 3672 | e1000_suspend(struct pci_dev *pdev, uint32_t state) |
3648 | { | 3673 | { |
3649 | struct net_device *netdev = pci_get_drvdata(pdev); | 3674 | struct net_device *netdev = pci_get_drvdata(pdev); |
3650 | struct e1000_adapter *adapter = netdev->priv; | 3675 | struct e1000_adapter *adapter = netdev_priv(netdev); |
3651 | uint32_t ctrl, ctrl_ext, rctl, manc, status, swsm; | 3676 | uint32_t ctrl, ctrl_ext, rctl, manc, status, swsm; |
3652 | uint32_t wufc = adapter->wol; | 3677 | uint32_t wufc = adapter->wol; |
3653 | 3678 | ||
@@ -3740,12 +3765,12 @@ static int | |||
3740 | e1000_resume(struct pci_dev *pdev) | 3765 | e1000_resume(struct pci_dev *pdev) |
3741 | { | 3766 | { |
3742 | struct net_device *netdev = pci_get_drvdata(pdev); | 3767 | struct net_device *netdev = pci_get_drvdata(pdev); |
3743 | struct e1000_adapter *adapter = netdev->priv; | 3768 | struct e1000_adapter *adapter = netdev_priv(netdev); |
3744 | uint32_t manc, ret, swsm; | 3769 | uint32_t manc, ret_val, swsm; |
3745 | 3770 | ||
3746 | pci_set_power_state(pdev, 0); | 3771 | pci_set_power_state(pdev, 0); |
3747 | pci_restore_state(pdev); | 3772 | pci_restore_state(pdev); |
3748 | ret = pci_enable_device(pdev); | 3773 | ret_val = pci_enable_device(pdev); |
3749 | pci_set_master(pdev); | 3774 | pci_set_master(pdev); |
3750 | 3775 | ||
3751 | pci_enable_wake(pdev, 3, 0); | 3776 | pci_enable_wake(pdev, 3, 0); |
@@ -3788,7 +3813,7 @@ e1000_resume(struct pci_dev *pdev) | |||
3788 | static void | 3813 | static void |
3789 | e1000_netpoll(struct net_device *netdev) | 3814 | e1000_netpoll(struct net_device *netdev) |
3790 | { | 3815 | { |
3791 | struct e1000_adapter *adapter = netdev->priv; | 3816 | struct e1000_adapter *adapter = netdev_priv(netdev); |
3792 | disable_irq(adapter->pdev->irq); | 3817 | disable_irq(adapter->pdev->irq); |
3793 | e1000_intr(adapter->pdev->irq, netdev, NULL); | 3818 | e1000_intr(adapter->pdev->irq, netdev, NULL); |
3794 | enable_irq(adapter->pdev->irq); | 3819 | enable_irq(adapter->pdev->irq); |
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 4ebcd052e150..64f0f697c958 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -82,6 +82,9 @@ | |||
82 | * 0.31: 14 Nov 2004: ethtool support for getting/setting link | 82 | * 0.31: 14 Nov 2004: ethtool support for getting/setting link |
83 | * capabilities. | 83 | * capabilities. |
84 | * 0.32: 16 Apr 2005: RX_ERROR4 handling added. | 84 | * 0.32: 16 Apr 2005: RX_ERROR4 handling added. |
85 | * 0.33: 16 May 2005: Support for MCP51 added. | ||
86 | * 0.34: 18 Jun 2005: Add DEV_NEED_LINKTIMER to all nForce nics. | ||
87 | * 0.35: 26 Jun 2005: Support for MCP55 added. | ||
85 | * | 88 | * |
86 | * Known bugs: | 89 | * Known bugs: |
87 | * We suspect that on some hardware no TX done interrupts are generated. | 90 | * We suspect that on some hardware no TX done interrupts are generated. |
@@ -93,7 +96,7 @@ | |||
93 | * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few | 96 | * DEV_NEED_TIMERIRQ will not harm you on sane hardware, only generating a few |
94 | * superfluous timer interrupts from the nic. | 97 | * superfluous timer interrupts from the nic. |
95 | */ | 98 | */ |
96 | #define FORCEDETH_VERSION "0.32" | 99 | #define FORCEDETH_VERSION "0.35" |
97 | #define DRV_NAME "forcedeth" | 100 | #define DRV_NAME "forcedeth" |
98 | 101 | ||
99 | #include <linux/module.h> | 102 | #include <linux/module.h> |
@@ -2005,7 +2008,9 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
2005 | /* handle different descriptor versions */ | 2008 | /* handle different descriptor versions */ |
2006 | if (pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_1 || | 2009 | if (pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_1 || |
2007 | pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_2 || | 2010 | pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_2 || |
2008 | pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_3) | 2011 | pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_3 || |
2012 | pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_12 || | ||
2013 | pci_dev->device == PCI_DEVICE_ID_NVIDIA_NVENET_13) | ||
2009 | np->desc_ver = DESC_VER_1; | 2014 | np->desc_ver = DESC_VER_1; |
2010 | else | 2015 | else |
2011 | np->desc_ver = DESC_VER_2; | 2016 | np->desc_ver = DESC_VER_2; |
@@ -2215,56 +2220,84 @@ static struct pci_device_id pci_tbl[] = { | |||
2215 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_4, | 2220 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_4, |
2216 | .subvendor = PCI_ANY_ID, | 2221 | .subvendor = PCI_ANY_ID, |
2217 | .subdevice = PCI_ANY_ID, | 2222 | .subdevice = PCI_ANY_ID, |
2218 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2223 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2219 | }, | 2224 | }, |
2220 | { /* nForce3 Ethernet Controller */ | 2225 | { /* nForce3 Ethernet Controller */ |
2221 | .vendor = PCI_VENDOR_ID_NVIDIA, | 2226 | .vendor = PCI_VENDOR_ID_NVIDIA, |
2222 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_5, | 2227 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_5, |
2223 | .subvendor = PCI_ANY_ID, | 2228 | .subvendor = PCI_ANY_ID, |
2224 | .subdevice = PCI_ANY_ID, | 2229 | .subdevice = PCI_ANY_ID, |
2225 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2230 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2226 | }, | 2231 | }, |
2227 | { /* nForce3 Ethernet Controller */ | 2232 | { /* nForce3 Ethernet Controller */ |
2228 | .vendor = PCI_VENDOR_ID_NVIDIA, | 2233 | .vendor = PCI_VENDOR_ID_NVIDIA, |
2229 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_6, | 2234 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_6, |
2230 | .subvendor = PCI_ANY_ID, | 2235 | .subvendor = PCI_ANY_ID, |
2231 | .subdevice = PCI_ANY_ID, | 2236 | .subdevice = PCI_ANY_ID, |
2232 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2237 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2233 | }, | 2238 | }, |
2234 | { /* nForce3 Ethernet Controller */ | 2239 | { /* nForce3 Ethernet Controller */ |
2235 | .vendor = PCI_VENDOR_ID_NVIDIA, | 2240 | .vendor = PCI_VENDOR_ID_NVIDIA, |
2236 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_7, | 2241 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_7, |
2237 | .subvendor = PCI_ANY_ID, | 2242 | .subvendor = PCI_ANY_ID, |
2238 | .subdevice = PCI_ANY_ID, | 2243 | .subdevice = PCI_ANY_ID, |
2239 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2244 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2240 | }, | 2245 | }, |
2241 | { /* CK804 Ethernet Controller */ | 2246 | { /* CK804 Ethernet Controller */ |
2242 | .vendor = PCI_VENDOR_ID_NVIDIA, | 2247 | .vendor = PCI_VENDOR_ID_NVIDIA, |
2243 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_8, | 2248 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_8, |
2244 | .subvendor = PCI_ANY_ID, | 2249 | .subvendor = PCI_ANY_ID, |
2245 | .subdevice = PCI_ANY_ID, | 2250 | .subdevice = PCI_ANY_ID, |
2246 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2251 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2247 | }, | 2252 | }, |
2248 | { /* CK804 Ethernet Controller */ | 2253 | { /* CK804 Ethernet Controller */ |
2249 | .vendor = PCI_VENDOR_ID_NVIDIA, | 2254 | .vendor = PCI_VENDOR_ID_NVIDIA, |
2250 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_9, | 2255 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_9, |
2251 | .subvendor = PCI_ANY_ID, | 2256 | .subvendor = PCI_ANY_ID, |
2252 | .subdevice = PCI_ANY_ID, | 2257 | .subdevice = PCI_ANY_ID, |
2253 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2258 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2254 | }, | 2259 | }, |
2255 | { /* MCP04 Ethernet Controller */ | 2260 | { /* MCP04 Ethernet Controller */ |
2256 | .vendor = PCI_VENDOR_ID_NVIDIA, | 2261 | .vendor = PCI_VENDOR_ID_NVIDIA, |
2257 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_10, | 2262 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_10, |
2258 | .subvendor = PCI_ANY_ID, | 2263 | .subvendor = PCI_ANY_ID, |
2259 | .subdevice = PCI_ANY_ID, | 2264 | .subdevice = PCI_ANY_ID, |
2260 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2265 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2261 | }, | 2266 | }, |
2262 | { /* MCP04 Ethernet Controller */ | 2267 | { /* MCP04 Ethernet Controller */ |
2263 | .vendor = PCI_VENDOR_ID_NVIDIA, | 2268 | .vendor = PCI_VENDOR_ID_NVIDIA, |
2264 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_11, | 2269 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_11, |
2265 | .subvendor = PCI_ANY_ID, | 2270 | .subvendor = PCI_ANY_ID, |
2266 | .subdevice = PCI_ANY_ID, | 2271 | .subdevice = PCI_ANY_ID, |
2267 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ, | 2272 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, |
2273 | }, | ||
2274 | { /* MCP51 Ethernet Controller */ | ||
2275 | .vendor = PCI_VENDOR_ID_NVIDIA, | ||
2276 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_12, | ||
2277 | .subvendor = PCI_ANY_ID, | ||
2278 | .subdevice = PCI_ANY_ID, | ||
2279 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, | ||
2280 | }, | ||
2281 | { /* MCP51 Ethernet Controller */ | ||
2282 | .vendor = PCI_VENDOR_ID_NVIDIA, | ||
2283 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_13, | ||
2284 | .subvendor = PCI_ANY_ID, | ||
2285 | .subdevice = PCI_ANY_ID, | ||
2286 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, | ||
2287 | }, | ||
2288 | { /* MCP55 Ethernet Controller */ | ||
2289 | .vendor = PCI_VENDOR_ID_NVIDIA, | ||
2290 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_14, | ||
2291 | .subvendor = PCI_ANY_ID, | ||
2292 | .subdevice = PCI_ANY_ID, | ||
2293 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, | ||
2294 | }, | ||
2295 | { /* MCP55 Ethernet Controller */ | ||
2296 | .vendor = PCI_VENDOR_ID_NVIDIA, | ||
2297 | .device = PCI_DEVICE_ID_NVIDIA_NVENET_15, | ||
2298 | .subvendor = PCI_ANY_ID, | ||
2299 | .subdevice = PCI_ANY_ID, | ||
2300 | .driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2|DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER, | ||
2268 | }, | 2301 | }, |
2269 | {0,}, | 2302 | {0,}, |
2270 | }; | 2303 | }; |
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index b43b2b11aacd..6518334b9280 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * drivers/net/gianfar.c | 2 | * drivers/net/gianfar.c |
3 | * | 3 | * |
4 | * Gianfar Ethernet Driver | 4 | * Gianfar Ethernet Driver |
@@ -22,10 +22,9 @@ | |||
22 | * B-V +1.62 | 22 | * B-V +1.62 |
23 | * | 23 | * |
24 | * Theory of operation | 24 | * Theory of operation |
25 | * This driver is designed for the Triple-speed Ethernet | 25 | * This driver is designed for the non-CPM ethernet controllers |
26 | * controllers on the Freescale 8540/8560 integrated processors, | 26 | * on the 85xx and 83xx family of integrated processors |
27 | * as well as the Fast Ethernet Controller on the 8540. | 27 | * |
28 | * | ||
29 | * The driver is initialized through platform_device. Structures which | 28 | * The driver is initialized through platform_device. Structures which |
30 | * define the configuration needed by the board are defined in a | 29 | * define the configuration needed by the board are defined in a |
31 | * board structure in arch/ppc/platforms (though I do not | 30 | * board structure in arch/ppc/platforms (though I do not |
@@ -39,12 +38,12 @@ | |||
39 | * | 38 | * |
40 | * The Gianfar Ethernet Controller uses a ring of buffer | 39 | * The Gianfar Ethernet Controller uses a ring of buffer |
41 | * descriptors. The beginning is indicated by a register | 40 | * descriptors. The beginning is indicated by a register |
42 | * pointing to the physical address of the start of the ring. | 41 | * pointing to the physical address of the start of the ring. |
43 | * The end is determined by a "wrap" bit being set in the | 42 | * The end is determined by a "wrap" bit being set in the |
44 | * last descriptor of the ring. | 43 | * last descriptor of the ring. |
45 | * | 44 | * |
46 | * When a packet is received, the RXF bit in the | 45 | * When a packet is received, the RXF bit in the |
47 | * IEVENT register is set, triggering an interrupt when the | 46 | * IEVENT register is set, triggering an interrupt when the |
48 | * corresponding bit in the IMASK register is also set (if | 47 | * corresponding bit in the IMASK register is also set (if |
49 | * interrupt coalescing is active, then the interrupt may not | 48 | * interrupt coalescing is active, then the interrupt may not |
50 | * happen immediately, but will wait until either a set number | 49 | * happen immediately, but will wait until either a set number |
@@ -52,7 +51,7 @@ | |||
52 | * interrupt handler will signal there is work to be done, and | 51 | * interrupt handler will signal there is work to be done, and |
53 | * exit. Without NAPI, the packet(s) will be handled | 52 | * exit. Without NAPI, the packet(s) will be handled |
54 | * immediately. Both methods will start at the last known empty | 53 | * immediately. Both methods will start at the last known empty |
55 | * descriptor, and process every subsequent descriptor until there | 54 | * descriptor, and process every subsequent descriptor until there |
56 | * are none left with data (NAPI will stop after a set number of | 55 | * are none left with data (NAPI will stop after a set number of |
57 | * packets to give time to other tasks, but will eventually | 56 | * packets to give time to other tasks, but will eventually |
58 | * process all the packets). The data arrives inside a | 57 | * process all the packets). The data arrives inside a |
@@ -83,9 +82,13 @@ | |||
83 | #include <linux/netdevice.h> | 82 | #include <linux/netdevice.h> |
84 | #include <linux/etherdevice.h> | 83 | #include <linux/etherdevice.h> |
85 | #include <linux/skbuff.h> | 84 | #include <linux/skbuff.h> |
85 | #include <linux/if_vlan.h> | ||
86 | #include <linux/spinlock.h> | 86 | #include <linux/spinlock.h> |
87 | #include <linux/mm.h> | 87 | #include <linux/mm.h> |
88 | #include <linux/device.h> | 88 | #include <linux/device.h> |
89 | #include <linux/ip.h> | ||
90 | #include <linux/tcp.h> | ||
91 | #include <linux/udp.h> | ||
89 | 92 | ||
90 | #include <asm/io.h> | 93 | #include <asm/io.h> |
91 | #include <asm/irq.h> | 94 | #include <asm/irq.h> |
@@ -123,7 +126,7 @@ static int gfar_set_mac_address(struct net_device *dev); | |||
123 | static int gfar_change_mtu(struct net_device *dev, int new_mtu); | 126 | static int gfar_change_mtu(struct net_device *dev, int new_mtu); |
124 | static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs); | 127 | static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs); |
125 | static irqreturn_t gfar_transmit(int irq, void *dev_id, struct pt_regs *regs); | 128 | static irqreturn_t gfar_transmit(int irq, void *dev_id, struct pt_regs *regs); |
126 | irqreturn_t gfar_receive(int irq, void *dev_id, struct pt_regs *regs); | 129 | static irqreturn_t gfar_receive(int irq, void *dev_id, struct pt_regs *regs); |
127 | static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 130 | static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs); |
128 | static irqreturn_t phy_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 131 | static irqreturn_t phy_interrupt(int irq, void *dev_id, struct pt_regs *regs); |
129 | static void gfar_phy_change(void *data); | 132 | static void gfar_phy_change(void *data); |
@@ -139,9 +142,12 @@ static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr); | |||
139 | #ifdef CONFIG_GFAR_NAPI | 142 | #ifdef CONFIG_GFAR_NAPI |
140 | static int gfar_poll(struct net_device *dev, int *budget); | 143 | static int gfar_poll(struct net_device *dev, int *budget); |
141 | #endif | 144 | #endif |
142 | static int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit); | 145 | int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit); |
143 | static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, int length); | 146 | static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, int length); |
144 | static void gfar_phy_startup_timer(unsigned long data); | 147 | static void gfar_phy_startup_timer(unsigned long data); |
148 | static void gfar_vlan_rx_register(struct net_device *netdev, | ||
149 | struct vlan_group *grp); | ||
150 | static void gfar_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid); | ||
145 | 151 | ||
146 | extern struct ethtool_ops gfar_ethtool_ops; | 152 | extern struct ethtool_ops gfar_ethtool_ops; |
147 | 153 | ||
@@ -149,6 +155,13 @@ MODULE_AUTHOR("Freescale Semiconductor, Inc"); | |||
149 | MODULE_DESCRIPTION("Gianfar Ethernet Driver"); | 155 | MODULE_DESCRIPTION("Gianfar Ethernet Driver"); |
150 | MODULE_LICENSE("GPL"); | 156 | MODULE_LICENSE("GPL"); |
151 | 157 | ||
158 | int gfar_uses_fcb(struct gfar_private *priv) | ||
159 | { | ||
160 | if (priv->vlan_enable || priv->rx_csum_enable) | ||
161 | return 1; | ||
162 | else | ||
163 | return 0; | ||
164 | } | ||
152 | static int gfar_probe(struct device *device) | 165 | static int gfar_probe(struct device *device) |
153 | { | 166 | { |
154 | u32 tempval; | 167 | u32 tempval; |
@@ -159,7 +172,6 @@ static int gfar_probe(struct device *device) | |||
159 | struct resource *r; | 172 | struct resource *r; |
160 | int idx; | 173 | int idx; |
161 | int err = 0; | 174 | int err = 0; |
162 | int dev_ethtool_ops = 0; | ||
163 | 175 | ||
164 | einfo = (struct gianfar_platform_data *) pdev->dev.platform_data; | 176 | einfo = (struct gianfar_platform_data *) pdev->dev.platform_data; |
165 | 177 | ||
@@ -265,15 +277,69 @@ static int gfar_probe(struct device *device) | |||
265 | dev->mtu = 1500; | 277 | dev->mtu = 1500; |
266 | dev->set_multicast_list = gfar_set_multi; | 278 | dev->set_multicast_list = gfar_set_multi; |
267 | 279 | ||
268 | /* Index into the array of possible ethtool | 280 | dev->ethtool_ops = &gfar_ethtool_ops; |
269 | * ops to catch all 4 possibilities */ | 281 | |
270 | if((priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_RMON) == 0) | 282 | if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_CSUM) { |
271 | dev_ethtool_ops += 1; | 283 | priv->rx_csum_enable = 1; |
284 | dev->features |= NETIF_F_IP_CSUM; | ||
285 | } else | ||
286 | priv->rx_csum_enable = 0; | ||
287 | |||
288 | priv->vlgrp = NULL; | ||
272 | 289 | ||
273 | if((priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_COALESCE) == 0) | 290 | if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_VLAN) { |
274 | dev_ethtool_ops += 2; | 291 | dev->vlan_rx_register = gfar_vlan_rx_register; |
292 | dev->vlan_rx_kill_vid = gfar_vlan_rx_kill_vid; | ||
275 | 293 | ||
276 | dev->ethtool_ops = gfar_op_array[dev_ethtool_ops]; | 294 | dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX; |
295 | |||
296 | priv->vlan_enable = 1; | ||
297 | } | ||
298 | |||
299 | if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_EXTENDED_HASH) { | ||
300 | priv->extended_hash = 1; | ||
301 | priv->hash_width = 9; | ||
302 | |||
303 | priv->hash_regs[0] = &priv->regs->igaddr0; | ||
304 | priv->hash_regs[1] = &priv->regs->igaddr1; | ||
305 | priv->hash_regs[2] = &priv->regs->igaddr2; | ||
306 | priv->hash_regs[3] = &priv->regs->igaddr3; | ||
307 | priv->hash_regs[4] = &priv->regs->igaddr4; | ||
308 | priv->hash_regs[5] = &priv->regs->igaddr5; | ||
309 | priv->hash_regs[6] = &priv->regs->igaddr6; | ||
310 | priv->hash_regs[7] = &priv->regs->igaddr7; | ||
311 | priv->hash_regs[8] = &priv->regs->gaddr0; | ||
312 | priv->hash_regs[9] = &priv->regs->gaddr1; | ||
313 | priv->hash_regs[10] = &priv->regs->gaddr2; | ||
314 | priv->hash_regs[11] = &priv->regs->gaddr3; | ||
315 | priv->hash_regs[12] = &priv->regs->gaddr4; | ||
316 | priv->hash_regs[13] = &priv->regs->gaddr5; | ||
317 | priv->hash_regs[14] = &priv->regs->gaddr6; | ||
318 | priv->hash_regs[15] = &priv->regs->gaddr7; | ||
319 | |||
320 | } else { | ||
321 | priv->extended_hash = 0; | ||
322 | priv->hash_width = 8; | ||
323 | |||
324 | priv->hash_regs[0] = &priv->regs->gaddr0; | ||
325 | priv->hash_regs[1] = &priv->regs->gaddr1; | ||
326 | priv->hash_regs[2] = &priv->regs->gaddr2; | ||
327 | priv->hash_regs[3] = &priv->regs->gaddr3; | ||
328 | priv->hash_regs[4] = &priv->regs->gaddr4; | ||
329 | priv->hash_regs[5] = &priv->regs->gaddr5; | ||
330 | priv->hash_regs[6] = &priv->regs->gaddr6; | ||
331 | priv->hash_regs[7] = &priv->regs->gaddr7; | ||
332 | } | ||
333 | |||
334 | if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_PADDING) | ||
335 | priv->padding = DEFAULT_PADDING; | ||
336 | else | ||
337 | priv->padding = 0; | ||
338 | |||
339 | dev->hard_header_len += priv->padding; | ||
340 | |||
341 | if (dev->features & NETIF_F_IP_CSUM) | ||
342 | dev->hard_header_len += GMAC_FCB_LEN; | ||
277 | 343 | ||
278 | priv->rx_buffer_size = DEFAULT_RX_BUFFER_SIZE; | 344 | priv->rx_buffer_size = DEFAULT_RX_BUFFER_SIZE; |
279 | #ifdef CONFIG_GFAR_BUFSTASH | 345 | #ifdef CONFIG_GFAR_BUFSTASH |
@@ -289,6 +355,9 @@ static int gfar_probe(struct device *device) | |||
289 | priv->rxcount = DEFAULT_RXCOUNT; | 355 | priv->rxcount = DEFAULT_RXCOUNT; |
290 | priv->rxtime = DEFAULT_RXTIME; | 356 | priv->rxtime = DEFAULT_RXTIME; |
291 | 357 | ||
358 | /* Enable most messages by default */ | ||
359 | priv->msg_enable = (NETIF_MSG_IFUP << 1 ) - 1; | ||
360 | |||
292 | err = register_netdev(dev); | 361 | err = register_netdev(dev); |
293 | 362 | ||
294 | if (err) { | 363 | if (err) { |
@@ -360,8 +429,9 @@ static int init_phy(struct net_device *dev) | |||
360 | GFP_KERNEL); | 429 | GFP_KERNEL); |
361 | 430 | ||
362 | if(NULL == mii_info) { | 431 | if(NULL == mii_info) { |
363 | printk(KERN_ERR "%s: Could not allocate mii_info\n", | 432 | if (netif_msg_ifup(priv)) |
364 | dev->name); | 433 | printk(KERN_ERR "%s: Could not allocate mii_info\n", |
434 | dev->name); | ||
365 | return -ENOMEM; | 435 | return -ENOMEM; |
366 | } | 436 | } |
367 | 437 | ||
@@ -410,7 +480,8 @@ static int init_phy(struct net_device *dev) | |||
410 | curphy = get_phy_info(priv->mii_info); | 480 | curphy = get_phy_info(priv->mii_info); |
411 | 481 | ||
412 | if (curphy == NULL) { | 482 | if (curphy == NULL) { |
413 | printk(KERN_ERR "%s: No PHY found\n", dev->name); | 483 | if (netif_msg_ifup(priv)) |
484 | printk(KERN_ERR "%s: No PHY found\n", dev->name); | ||
414 | err = -1; | 485 | err = -1; |
415 | goto no_phy; | 486 | goto no_phy; |
416 | } | 487 | } |
@@ -421,7 +492,7 @@ static int init_phy(struct net_device *dev) | |||
421 | if(curphy->init) { | 492 | if(curphy->init) { |
422 | err = curphy->init(priv->mii_info); | 493 | err = curphy->init(priv->mii_info); |
423 | 494 | ||
424 | if (err) | 495 | if (err) |
425 | goto phy_init_fail; | 496 | goto phy_init_fail; |
426 | } | 497 | } |
427 | 498 | ||
@@ -446,14 +517,14 @@ static void init_registers(struct net_device *dev) | |||
446 | gfar_write(&priv->regs->imask, IMASK_INIT_CLEAR); | 517 | gfar_write(&priv->regs->imask, IMASK_INIT_CLEAR); |
447 | 518 | ||
448 | /* Init hash registers to zero */ | 519 | /* Init hash registers to zero */ |
449 | gfar_write(&priv->regs->iaddr0, 0); | 520 | gfar_write(&priv->regs->igaddr0, 0); |
450 | gfar_write(&priv->regs->iaddr1, 0); | 521 | gfar_write(&priv->regs->igaddr1, 0); |
451 | gfar_write(&priv->regs->iaddr2, 0); | 522 | gfar_write(&priv->regs->igaddr2, 0); |
452 | gfar_write(&priv->regs->iaddr3, 0); | 523 | gfar_write(&priv->regs->igaddr3, 0); |
453 | gfar_write(&priv->regs->iaddr4, 0); | 524 | gfar_write(&priv->regs->igaddr4, 0); |
454 | gfar_write(&priv->regs->iaddr5, 0); | 525 | gfar_write(&priv->regs->igaddr5, 0); |
455 | gfar_write(&priv->regs->iaddr6, 0); | 526 | gfar_write(&priv->regs->igaddr6, 0); |
456 | gfar_write(&priv->regs->iaddr7, 0); | 527 | gfar_write(&priv->regs->igaddr7, 0); |
457 | 528 | ||
458 | gfar_write(&priv->regs->gaddr0, 0); | 529 | gfar_write(&priv->regs->gaddr0, 0); |
459 | gfar_write(&priv->regs->gaddr1, 0); | 530 | gfar_write(&priv->regs->gaddr1, 0); |
@@ -464,9 +535,6 @@ static void init_registers(struct net_device *dev) | |||
464 | gfar_write(&priv->regs->gaddr6, 0); | 535 | gfar_write(&priv->regs->gaddr6, 0); |
465 | gfar_write(&priv->regs->gaddr7, 0); | 536 | gfar_write(&priv->regs->gaddr7, 0); |
466 | 537 | ||
467 | /* Zero out rctrl */ | ||
468 | gfar_write(&priv->regs->rctrl, 0x00000000); | ||
469 | |||
470 | /* Zero out the rmon mib registers if it has them */ | 538 | /* Zero out the rmon mib registers if it has them */ |
471 | if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_RMON) { | 539 | if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_RMON) { |
472 | memset((void *) &(priv->regs->rmon), 0, | 540 | memset((void *) &(priv->regs->rmon), 0, |
@@ -497,20 +565,14 @@ static void init_registers(struct net_device *dev) | |||
497 | gfar_write(&priv->regs->tbipa, TBIPA_VALUE); | 565 | gfar_write(&priv->regs->tbipa, TBIPA_VALUE); |
498 | } | 566 | } |
499 | 567 | ||
500 | void stop_gfar(struct net_device *dev) | 568 | |
569 | /* Halt the receive and transmit queues */ | ||
570 | void gfar_halt(struct net_device *dev) | ||
501 | { | 571 | { |
502 | struct gfar_private *priv = netdev_priv(dev); | 572 | struct gfar_private *priv = netdev_priv(dev); |
503 | struct gfar *regs = priv->regs; | 573 | struct gfar *regs = priv->regs; |
504 | unsigned long flags; | ||
505 | u32 tempval; | 574 | u32 tempval; |
506 | 575 | ||
507 | /* Lock it down */ | ||
508 | spin_lock_irqsave(&priv->lock, flags); | ||
509 | |||
510 | /* Tell the kernel the link is down */ | ||
511 | priv->mii_info->link = 0; | ||
512 | adjust_link(dev); | ||
513 | |||
514 | /* Mask all interrupts */ | 576 | /* Mask all interrupts */ |
515 | gfar_write(®s->imask, IMASK_INIT_CLEAR); | 577 | gfar_write(®s->imask, IMASK_INIT_CLEAR); |
516 | 578 | ||
@@ -533,13 +595,29 @@ void stop_gfar(struct net_device *dev) | |||
533 | tempval = gfar_read(®s->maccfg1); | 595 | tempval = gfar_read(®s->maccfg1); |
534 | tempval &= ~(MACCFG1_RX_EN | MACCFG1_TX_EN); | 596 | tempval &= ~(MACCFG1_RX_EN | MACCFG1_TX_EN); |
535 | gfar_write(®s->maccfg1, tempval); | 597 | gfar_write(®s->maccfg1, tempval); |
598 | } | ||
599 | |||
600 | void stop_gfar(struct net_device *dev) | ||
601 | { | ||
602 | struct gfar_private *priv = netdev_priv(dev); | ||
603 | struct gfar *regs = priv->regs; | ||
604 | unsigned long flags; | ||
605 | |||
606 | /* Lock it down */ | ||
607 | spin_lock_irqsave(&priv->lock, flags); | ||
608 | |||
609 | /* Tell the kernel the link is down */ | ||
610 | priv->mii_info->link = 0; | ||
611 | adjust_link(dev); | ||
612 | |||
613 | gfar_halt(dev); | ||
536 | 614 | ||
537 | if (priv->einfo->board_flags & FSL_GIANFAR_BRD_HAS_PHY_INTR) { | 615 | if (priv->einfo->board_flags & FSL_GIANFAR_BRD_HAS_PHY_INTR) { |
538 | /* Clear any pending interrupts */ | 616 | /* Clear any pending interrupts */ |
539 | mii_clear_phy_interrupt(priv->mii_info); | 617 | mii_clear_phy_interrupt(priv->mii_info); |
540 | 618 | ||
541 | /* Disable PHY Interrupts */ | 619 | /* Disable PHY Interrupts */ |
542 | mii_configure_phy_interrupt(priv->mii_info, | 620 | mii_configure_phy_interrupt(priv->mii_info, |
543 | MII_INTERRUPT_DISABLED); | 621 | MII_INTERRUPT_DISABLED); |
544 | } | 622 | } |
545 | 623 | ||
@@ -566,7 +644,7 @@ void stop_gfar(struct net_device *dev) | |||
566 | sizeof(struct txbd8)*priv->tx_ring_size | 644 | sizeof(struct txbd8)*priv->tx_ring_size |
567 | + sizeof(struct rxbd8)*priv->rx_ring_size, | 645 | + sizeof(struct rxbd8)*priv->rx_ring_size, |
568 | priv->tx_bd_base, | 646 | priv->tx_bd_base, |
569 | gfar_read(®s->tbase)); | 647 | gfar_read(®s->tbase0)); |
570 | } | 648 | } |
571 | 649 | ||
572 | /* If there are any tx skbs or rx skbs still around, free them. | 650 | /* If there are any tx skbs or rx skbs still around, free them. |
@@ -620,6 +698,34 @@ void free_skb_resources(struct gfar_private *priv) | |||
620 | } | 698 | } |
621 | } | 699 | } |
622 | 700 | ||
701 | void gfar_start(struct net_device *dev) | ||
702 | { | ||
703 | struct gfar_private *priv = netdev_priv(dev); | ||
704 | struct gfar *regs = priv->regs; | ||
705 | u32 tempval; | ||
706 | |||
707 | /* Enable Rx and Tx in MACCFG1 */ | ||
708 | tempval = gfar_read(®s->maccfg1); | ||
709 | tempval |= (MACCFG1_RX_EN | MACCFG1_TX_EN); | ||
710 | gfar_write(®s->maccfg1, tempval); | ||
711 | |||
712 | /* Initialize DMACTRL to have WWR and WOP */ | ||
713 | tempval = gfar_read(&priv->regs->dmactrl); | ||
714 | tempval |= DMACTRL_INIT_SETTINGS; | ||
715 | gfar_write(&priv->regs->dmactrl, tempval); | ||
716 | |||
717 | /* Clear THLT, so that the DMA starts polling now */ | ||
718 | gfar_write(®s->tstat, TSTAT_CLEAR_THALT); | ||
719 | |||
720 | /* Make sure we aren't stopped */ | ||
721 | tempval = gfar_read(&priv->regs->dmactrl); | ||
722 | tempval &= ~(DMACTRL_GRS | DMACTRL_GTS); | ||
723 | gfar_write(&priv->regs->dmactrl, tempval); | ||
724 | |||
725 | /* Unmask the interrupts we look for */ | ||
726 | gfar_write(®s->imask, IMASK_DEFAULT); | ||
727 | } | ||
728 | |||
623 | /* Bring the controller up and running */ | 729 | /* Bring the controller up and running */ |
624 | int startup_gfar(struct net_device *dev) | 730 | int startup_gfar(struct net_device *dev) |
625 | { | 731 | { |
@@ -630,33 +736,34 @@ int startup_gfar(struct net_device *dev) | |||
630 | int i; | 736 | int i; |
631 | struct gfar_private *priv = netdev_priv(dev); | 737 | struct gfar_private *priv = netdev_priv(dev); |
632 | struct gfar *regs = priv->regs; | 738 | struct gfar *regs = priv->regs; |
633 | u32 tempval; | ||
634 | int err = 0; | 739 | int err = 0; |
740 | u32 rctrl = 0; | ||
635 | 741 | ||
636 | gfar_write(®s->imask, IMASK_INIT_CLEAR); | 742 | gfar_write(®s->imask, IMASK_INIT_CLEAR); |
637 | 743 | ||
638 | /* Allocate memory for the buffer descriptors */ | 744 | /* Allocate memory for the buffer descriptors */ |
639 | vaddr = (unsigned long) dma_alloc_coherent(NULL, | 745 | vaddr = (unsigned long) dma_alloc_coherent(NULL, |
640 | sizeof (struct txbd8) * priv->tx_ring_size + | 746 | sizeof (struct txbd8) * priv->tx_ring_size + |
641 | sizeof (struct rxbd8) * priv->rx_ring_size, | 747 | sizeof (struct rxbd8) * priv->rx_ring_size, |
642 | &addr, GFP_KERNEL); | 748 | &addr, GFP_KERNEL); |
643 | 749 | ||
644 | if (vaddr == 0) { | 750 | if (vaddr == 0) { |
645 | printk(KERN_ERR "%s: Could not allocate buffer descriptors!\n", | 751 | if (netif_msg_ifup(priv)) |
646 | dev->name); | 752 | printk(KERN_ERR "%s: Could not allocate buffer descriptors!\n", |
753 | dev->name); | ||
647 | return -ENOMEM; | 754 | return -ENOMEM; |
648 | } | 755 | } |
649 | 756 | ||
650 | priv->tx_bd_base = (struct txbd8 *) vaddr; | 757 | priv->tx_bd_base = (struct txbd8 *) vaddr; |
651 | 758 | ||
652 | /* enet DMA only understands physical addresses */ | 759 | /* enet DMA only understands physical addresses */ |
653 | gfar_write(®s->tbase, addr); | 760 | gfar_write(®s->tbase0, addr); |
654 | 761 | ||
655 | /* Start the rx descriptor ring where the tx ring leaves off */ | 762 | /* Start the rx descriptor ring where the tx ring leaves off */ |
656 | addr = addr + sizeof (struct txbd8) * priv->tx_ring_size; | 763 | addr = addr + sizeof (struct txbd8) * priv->tx_ring_size; |
657 | vaddr = vaddr + sizeof (struct txbd8) * priv->tx_ring_size; | 764 | vaddr = vaddr + sizeof (struct txbd8) * priv->tx_ring_size; |
658 | priv->rx_bd_base = (struct rxbd8 *) vaddr; | 765 | priv->rx_bd_base = (struct rxbd8 *) vaddr; |
659 | gfar_write(®s->rbase, addr); | 766 | gfar_write(®s->rbase0, addr); |
660 | 767 | ||
661 | /* Setup the skbuff rings */ | 768 | /* Setup the skbuff rings */ |
662 | priv->tx_skbuff = | 769 | priv->tx_skbuff = |
@@ -664,8 +771,9 @@ int startup_gfar(struct net_device *dev) | |||
664 | priv->tx_ring_size, GFP_KERNEL); | 771 | priv->tx_ring_size, GFP_KERNEL); |
665 | 772 | ||
666 | if (priv->tx_skbuff == NULL) { | 773 | if (priv->tx_skbuff == NULL) { |
667 | printk(KERN_ERR "%s: Could not allocate tx_skbuff\n", | 774 | if (netif_msg_ifup(priv)) |
668 | dev->name); | 775 | printk(KERN_ERR "%s: Could not allocate tx_skbuff\n", |
776 | dev->name); | ||
669 | err = -ENOMEM; | 777 | err = -ENOMEM; |
670 | goto tx_skb_fail; | 778 | goto tx_skb_fail; |
671 | } | 779 | } |
@@ -678,8 +786,9 @@ int startup_gfar(struct net_device *dev) | |||
678 | priv->rx_ring_size, GFP_KERNEL); | 786 | priv->rx_ring_size, GFP_KERNEL); |
679 | 787 | ||
680 | if (priv->rx_skbuff == NULL) { | 788 | if (priv->rx_skbuff == NULL) { |
681 | printk(KERN_ERR "%s: Could not allocate rx_skbuff\n", | 789 | if (netif_msg_ifup(priv)) |
682 | dev->name); | 790 | printk(KERN_ERR "%s: Could not allocate rx_skbuff\n", |
791 | dev->name); | ||
683 | err = -ENOMEM; | 792 | err = -ENOMEM; |
684 | goto rx_skb_fail; | 793 | goto rx_skb_fail; |
685 | } | 794 | } |
@@ -726,12 +835,13 @@ int startup_gfar(struct net_device *dev) | |||
726 | /* If the device has multiple interrupts, register for | 835 | /* If the device has multiple interrupts, register for |
727 | * them. Otherwise, only register for the one */ | 836 | * them. Otherwise, only register for the one */ |
728 | if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) { | 837 | if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) { |
729 | /* Install our interrupt handlers for Error, | 838 | /* Install our interrupt handlers for Error, |
730 | * Transmit, and Receive */ | 839 | * Transmit, and Receive */ |
731 | if (request_irq(priv->interruptError, gfar_error, | 840 | if (request_irq(priv->interruptError, gfar_error, |
732 | 0, "enet_error", dev) < 0) { | 841 | 0, "enet_error", dev) < 0) { |
733 | printk(KERN_ERR "%s: Can't get IRQ %d\n", | 842 | if (netif_msg_intr(priv)) |
734 | dev->name, priv->interruptError); | 843 | printk(KERN_ERR "%s: Can't get IRQ %d\n", |
844 | dev->name, priv->interruptError); | ||
735 | 845 | ||
736 | err = -1; | 846 | err = -1; |
737 | goto err_irq_fail; | 847 | goto err_irq_fail; |
@@ -739,8 +849,9 @@ int startup_gfar(struct net_device *dev) | |||
739 | 849 | ||
740 | if (request_irq(priv->interruptTransmit, gfar_transmit, | 850 | if (request_irq(priv->interruptTransmit, gfar_transmit, |
741 | 0, "enet_tx", dev) < 0) { | 851 | 0, "enet_tx", dev) < 0) { |
742 | printk(KERN_ERR "%s: Can't get IRQ %d\n", | 852 | if (netif_msg_intr(priv)) |
743 | dev->name, priv->interruptTransmit); | 853 | printk(KERN_ERR "%s: Can't get IRQ %d\n", |
854 | dev->name, priv->interruptTransmit); | ||
744 | 855 | ||
745 | err = -1; | 856 | err = -1; |
746 | 857 | ||
@@ -749,8 +860,9 @@ int startup_gfar(struct net_device *dev) | |||
749 | 860 | ||
750 | if (request_irq(priv->interruptReceive, gfar_receive, | 861 | if (request_irq(priv->interruptReceive, gfar_receive, |
751 | 0, "enet_rx", dev) < 0) { | 862 | 0, "enet_rx", dev) < 0) { |
752 | printk(KERN_ERR "%s: Can't get IRQ %d (receive0)\n", | 863 | if (netif_msg_intr(priv)) |
753 | dev->name, priv->interruptReceive); | 864 | printk(KERN_ERR "%s: Can't get IRQ %d (receive0)\n", |
865 | dev->name, priv->interruptReceive); | ||
754 | 866 | ||
755 | err = -1; | 867 | err = -1; |
756 | goto rx_irq_fail; | 868 | goto rx_irq_fail; |
@@ -758,8 +870,9 @@ int startup_gfar(struct net_device *dev) | |||
758 | } else { | 870 | } else { |
759 | if (request_irq(priv->interruptTransmit, gfar_interrupt, | 871 | if (request_irq(priv->interruptTransmit, gfar_interrupt, |
760 | 0, "gfar_interrupt", dev) < 0) { | 872 | 0, "gfar_interrupt", dev) < 0) { |
761 | printk(KERN_ERR "%s: Can't get IRQ %d\n", | 873 | if (netif_msg_intr(priv)) |
762 | dev->name, priv->interruptError); | 874 | printk(KERN_ERR "%s: Can't get IRQ %d\n", |
875 | dev->name, priv->interruptError); | ||
763 | 876 | ||
764 | err = -1; | 877 | err = -1; |
765 | goto err_irq_fail; | 878 | goto err_irq_fail; |
@@ -787,28 +900,22 @@ int startup_gfar(struct net_device *dev) | |||
787 | else | 900 | else |
788 | gfar_write(®s->rxic, 0); | 901 | gfar_write(®s->rxic, 0); |
789 | 902 | ||
790 | init_waitqueue_head(&priv->rxcleanupq); | 903 | if (priv->rx_csum_enable) |
904 | rctrl |= RCTRL_CHECKSUMMING; | ||
791 | 905 | ||
792 | /* Enable Rx and Tx in MACCFG1 */ | 906 | if (priv->extended_hash) |
793 | tempval = gfar_read(®s->maccfg1); | 907 | rctrl |= RCTRL_EXTHASH; |
794 | tempval |= (MACCFG1_RX_EN | MACCFG1_TX_EN); | ||
795 | gfar_write(®s->maccfg1, tempval); | ||
796 | 908 | ||
797 | /* Initialize DMACTRL to have WWR and WOP */ | 909 | if (priv->vlan_enable) |
798 | tempval = gfar_read(&priv->regs->dmactrl); | 910 | rctrl |= RCTRL_VLAN; |
799 | tempval |= DMACTRL_INIT_SETTINGS; | ||
800 | gfar_write(&priv->regs->dmactrl, tempval); | ||
801 | 911 | ||
802 | /* Clear THLT, so that the DMA starts polling now */ | 912 | /* Init rctrl based on our settings */ |
803 | gfar_write(®s->tstat, TSTAT_CLEAR_THALT); | 913 | gfar_write(&priv->regs->rctrl, rctrl); |
804 | 914 | ||
805 | /* Make sure we aren't stopped */ | 915 | if (dev->features & NETIF_F_IP_CSUM) |
806 | tempval = gfar_read(&priv->regs->dmactrl); | 916 | gfar_write(&priv->regs->tctrl, TCTRL_INIT_CSUM); |
807 | tempval &= ~(DMACTRL_GRS | DMACTRL_GTS); | ||
808 | gfar_write(&priv->regs->dmactrl, tempval); | ||
809 | 917 | ||
810 | /* Unmask the interrupts we look for */ | 918 | gfar_start(dev); |
811 | gfar_write(®s->imask, IMASK_DEFAULT); | ||
812 | 919 | ||
813 | return 0; | 920 | return 0; |
814 | 921 | ||
@@ -824,7 +931,7 @@ tx_skb_fail: | |||
824 | sizeof(struct txbd8)*priv->tx_ring_size | 931 | sizeof(struct txbd8)*priv->tx_ring_size |
825 | + sizeof(struct rxbd8)*priv->rx_ring_size, | 932 | + sizeof(struct rxbd8)*priv->rx_ring_size, |
826 | priv->tx_bd_base, | 933 | priv->tx_bd_base, |
827 | gfar_read(®s->tbase)); | 934 | gfar_read(®s->tbase0)); |
828 | 935 | ||
829 | if (priv->mii_info->phyinfo->close) | 936 | if (priv->mii_info->phyinfo->close) |
830 | priv->mii_info->phyinfo->close(priv->mii_info); | 937 | priv->mii_info->phyinfo->close(priv->mii_info); |
@@ -857,11 +964,62 @@ static int gfar_enet_open(struct net_device *dev) | |||
857 | return err; | 964 | return err; |
858 | } | 965 | } |
859 | 966 | ||
967 | static struct txfcb *gfar_add_fcb(struct sk_buff *skb, struct txbd8 *bdp) | ||
968 | { | ||
969 | struct txfcb *fcb = (struct txfcb *)skb_push (skb, GMAC_FCB_LEN); | ||
970 | |||
971 | memset(fcb, 0, GMAC_FCB_LEN); | ||
972 | |||
973 | /* Flag the bd so the controller looks for the FCB */ | ||
974 | bdp->status |= TXBD_TOE; | ||
975 | |||
976 | return fcb; | ||
977 | } | ||
978 | |||
979 | static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb) | ||
980 | { | ||
981 | int len; | ||
982 | |||
983 | /* If we're here, it's a IP packet with a TCP or UDP | ||
984 | * payload. We set it to checksum, using a pseudo-header | ||
985 | * we provide | ||
986 | */ | ||
987 | fcb->ip = 1; | ||
988 | fcb->tup = 1; | ||
989 | fcb->ctu = 1; | ||
990 | fcb->nph = 1; | ||
991 | |||
992 | /* Notify the controller what the protocol is */ | ||
993 | if (skb->nh.iph->protocol == IPPROTO_UDP) | ||
994 | fcb->udp = 1; | ||
995 | |||
996 | /* l3os is the distance between the start of the | ||
997 | * frame (skb->data) and the start of the IP hdr. | ||
998 | * l4os is the distance between the start of the | ||
999 | * l3 hdr and the l4 hdr */ | ||
1000 | fcb->l3os = (u16)(skb->nh.raw - skb->data - GMAC_FCB_LEN); | ||
1001 | fcb->l4os = (u16)(skb->h.raw - skb->nh.raw); | ||
1002 | |||
1003 | len = skb->nh.iph->tot_len - fcb->l4os; | ||
1004 | |||
1005 | /* Provide the pseudoheader csum */ | ||
1006 | fcb->phcs = ~csum_tcpudp_magic(skb->nh.iph->saddr, | ||
1007 | skb->nh.iph->daddr, len, | ||
1008 | skb->nh.iph->protocol, 0); | ||
1009 | } | ||
1010 | |||
1011 | void gfar_tx_vlan(struct sk_buff *skb, struct txfcb *fcb) | ||
1012 | { | ||
1013 | fcb->vln = 1; | ||
1014 | fcb->vlctl = vlan_tx_tag_get(skb); | ||
1015 | } | ||
1016 | |||
860 | /* This is called by the kernel when a frame is ready for transmission. */ | 1017 | /* This is called by the kernel when a frame is ready for transmission. */ |
861 | /* It is pointed to by the dev->hard_start_xmit function pointer */ | 1018 | /* It is pointed to by the dev->hard_start_xmit function pointer */ |
862 | static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) | 1019 | static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) |
863 | { | 1020 | { |
864 | struct gfar_private *priv = netdev_priv(dev); | 1021 | struct gfar_private *priv = netdev_priv(dev); |
1022 | struct txfcb *fcb = NULL; | ||
865 | struct txbd8 *txbdp; | 1023 | struct txbd8 *txbdp; |
866 | 1024 | ||
867 | /* Update transmit stats */ | 1025 | /* Update transmit stats */ |
@@ -876,9 +1034,24 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
876 | /* Clear all but the WRAP status flags */ | 1034 | /* Clear all but the WRAP status flags */ |
877 | txbdp->status &= TXBD_WRAP; | 1035 | txbdp->status &= TXBD_WRAP; |
878 | 1036 | ||
1037 | /* Set up checksumming */ | ||
1038 | if ((dev->features & NETIF_F_IP_CSUM) | ||
1039 | && (CHECKSUM_HW == skb->ip_summed)) { | ||
1040 | fcb = gfar_add_fcb(skb, txbdp); | ||
1041 | gfar_tx_checksum(skb, fcb); | ||
1042 | } | ||
1043 | |||
1044 | if (priv->vlan_enable && | ||
1045 | unlikely(priv->vlgrp && vlan_tx_tag_present(skb))) { | ||
1046 | if (NULL == fcb) | ||
1047 | fcb = gfar_add_fcb(skb, txbdp); | ||
1048 | |||
1049 | gfar_tx_vlan(skb, fcb); | ||
1050 | } | ||
1051 | |||
879 | /* Set buffer length and pointer */ | 1052 | /* Set buffer length and pointer */ |
880 | txbdp->length = skb->len; | 1053 | txbdp->length = skb->len; |
881 | txbdp->bufPtr = dma_map_single(NULL, skb->data, | 1054 | txbdp->bufPtr = dma_map_single(NULL, skb->data, |
882 | skb->len, DMA_TO_DEVICE); | 1055 | skb->len, DMA_TO_DEVICE); |
883 | 1056 | ||
884 | /* Save the skb pointer so we can free it later */ | 1057 | /* Save the skb pointer so we can free it later */ |
@@ -972,15 +1145,78 @@ int gfar_set_mac_address(struct net_device *dev) | |||
972 | } | 1145 | } |
973 | 1146 | ||
974 | 1147 | ||
1148 | /* Enables and disables VLAN insertion/extraction */ | ||
1149 | static void gfar_vlan_rx_register(struct net_device *dev, | ||
1150 | struct vlan_group *grp) | ||
1151 | { | ||
1152 | struct gfar_private *priv = netdev_priv(dev); | ||
1153 | unsigned long flags; | ||
1154 | u32 tempval; | ||
1155 | |||
1156 | spin_lock_irqsave(&priv->lock, flags); | ||
1157 | |||
1158 | priv->vlgrp = grp; | ||
1159 | |||
1160 | if (grp) { | ||
1161 | /* Enable VLAN tag insertion */ | ||
1162 | tempval = gfar_read(&priv->regs->tctrl); | ||
1163 | tempval |= TCTRL_VLINS; | ||
1164 | |||
1165 | gfar_write(&priv->regs->tctrl, tempval); | ||
1166 | |||
1167 | /* Enable VLAN tag extraction */ | ||
1168 | tempval = gfar_read(&priv->regs->rctrl); | ||
1169 | tempval |= RCTRL_VLEX; | ||
1170 | gfar_write(&priv->regs->rctrl, tempval); | ||
1171 | } else { | ||
1172 | /* Disable VLAN tag insertion */ | ||
1173 | tempval = gfar_read(&priv->regs->tctrl); | ||
1174 | tempval &= ~TCTRL_VLINS; | ||
1175 | gfar_write(&priv->regs->tctrl, tempval); | ||
1176 | |||
1177 | /* Disable VLAN tag extraction */ | ||
1178 | tempval = gfar_read(&priv->regs->rctrl); | ||
1179 | tempval &= ~RCTRL_VLEX; | ||
1180 | gfar_write(&priv->regs->rctrl, tempval); | ||
1181 | } | ||
1182 | |||
1183 | spin_unlock_irqrestore(&priv->lock, flags); | ||
1184 | } | ||
1185 | |||
1186 | |||
1187 | static void gfar_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid) | ||
1188 | { | ||
1189 | struct gfar_private *priv = netdev_priv(dev); | ||
1190 | unsigned long flags; | ||
1191 | |||
1192 | spin_lock_irqsave(&priv->lock, flags); | ||
1193 | |||
1194 | if (priv->vlgrp) | ||
1195 | priv->vlgrp->vlan_devices[vid] = NULL; | ||
1196 | |||
1197 | spin_unlock_irqrestore(&priv->lock, flags); | ||
1198 | } | ||
1199 | |||
1200 | |||
975 | static int gfar_change_mtu(struct net_device *dev, int new_mtu) | 1201 | static int gfar_change_mtu(struct net_device *dev, int new_mtu) |
976 | { | 1202 | { |
977 | int tempsize, tempval; | 1203 | int tempsize, tempval; |
978 | struct gfar_private *priv = netdev_priv(dev); | 1204 | struct gfar_private *priv = netdev_priv(dev); |
979 | int oldsize = priv->rx_buffer_size; | 1205 | int oldsize = priv->rx_buffer_size; |
980 | int frame_size = new_mtu + 18; | 1206 | int frame_size = new_mtu + ETH_HLEN; |
1207 | |||
1208 | if (priv->vlan_enable) | ||
1209 | frame_size += VLAN_ETH_HLEN; | ||
1210 | |||
1211 | if (gfar_uses_fcb(priv)) | ||
1212 | frame_size += GMAC_FCB_LEN; | ||
1213 | |||
1214 | frame_size += priv->padding; | ||
981 | 1215 | ||
982 | if ((frame_size < 64) || (frame_size > JUMBO_FRAME_SIZE)) { | 1216 | if ((frame_size < 64) || (frame_size > JUMBO_FRAME_SIZE)) { |
983 | printk(KERN_ERR "%s: Invalid MTU setting\n", dev->name); | 1217 | if (netif_msg_drv(priv)) |
1218 | printk(KERN_ERR "%s: Invalid MTU setting\n", | ||
1219 | dev->name); | ||
984 | return -EINVAL; | 1220 | return -EINVAL; |
985 | } | 1221 | } |
986 | 1222 | ||
@@ -1120,7 +1356,7 @@ struct sk_buff * gfar_new_skb(struct net_device *dev, struct rxbd8 *bdp) | |||
1120 | skb->dev = dev; | 1356 | skb->dev = dev; |
1121 | 1357 | ||
1122 | bdp->bufPtr = dma_map_single(NULL, skb->data, | 1358 | bdp->bufPtr = dma_map_single(NULL, skb->data, |
1123 | priv->rx_buffer_size + RXBUF_ALIGNMENT, | 1359 | priv->rx_buffer_size + RXBUF_ALIGNMENT, |
1124 | DMA_FROM_DEVICE); | 1360 | DMA_FROM_DEVICE); |
1125 | 1361 | ||
1126 | bdp->length = 0; | 1362 | bdp->length = 0; |
@@ -1190,11 +1426,10 @@ irqreturn_t gfar_receive(int irq, void *dev_id, struct pt_regs *regs) | |||
1190 | 1426 | ||
1191 | __netif_rx_schedule(dev); | 1427 | __netif_rx_schedule(dev); |
1192 | } else { | 1428 | } else { |
1193 | #ifdef VERBOSE_GFAR_ERRORS | 1429 | if (netif_msg_rx_err(priv)) |
1194 | printk(KERN_DEBUG "%s: receive called twice (%x)[%x]\n", | 1430 | printk(KERN_DEBUG "%s: receive called twice (%x)[%x]\n", |
1195 | dev->name, gfar_read(&priv->regs->ievent), | 1431 | dev->name, gfar_read(&priv->regs->ievent), |
1196 | gfar_read(&priv->regs->imask)); | 1432 | gfar_read(&priv->regs->imask)); |
1197 | #endif | ||
1198 | } | 1433 | } |
1199 | #else | 1434 | #else |
1200 | 1435 | ||
@@ -1209,15 +1444,43 @@ irqreturn_t gfar_receive(int irq, void *dev_id, struct pt_regs *regs) | |||
1209 | else | 1444 | else |
1210 | gfar_write(&priv->regs->rxic, 0); | 1445 | gfar_write(&priv->regs->rxic, 0); |
1211 | 1446 | ||
1212 | /* Just in case we need to wake the ring param changer */ | ||
1213 | priv->rxclean = 1; | ||
1214 | |||
1215 | spin_unlock(&priv->lock); | 1447 | spin_unlock(&priv->lock); |
1216 | #endif | 1448 | #endif |
1217 | 1449 | ||
1218 | return IRQ_HANDLED; | 1450 | return IRQ_HANDLED; |
1219 | } | 1451 | } |
1220 | 1452 | ||
1453 | static inline int gfar_rx_vlan(struct sk_buff *skb, | ||
1454 | struct vlan_group *vlgrp, unsigned short vlctl) | ||
1455 | { | ||
1456 | #ifdef CONFIG_GFAR_NAPI | ||
1457 | return vlan_hwaccel_receive_skb(skb, vlgrp, vlctl); | ||
1458 | #else | ||
1459 | return vlan_hwaccel_rx(skb, vlgrp, vlctl); | ||
1460 | #endif | ||
1461 | } | ||
1462 | |||
1463 | static inline void gfar_rx_checksum(struct sk_buff *skb, struct rxfcb *fcb) | ||
1464 | { | ||
1465 | /* If valid headers were found, and valid sums | ||
1466 | * were verified, then we tell the kernel that no | ||
1467 | * checksumming is necessary. Otherwise, it is */ | ||
1468 | if (fcb->cip && !fcb->eip && fcb->ctu && !fcb->etu) | ||
1469 | skb->ip_summed = CHECKSUM_UNNECESSARY; | ||
1470 | else | ||
1471 | skb->ip_summed = CHECKSUM_NONE; | ||
1472 | } | ||
1473 | |||
1474 | |||
1475 | static inline struct rxfcb *gfar_get_fcb(struct sk_buff *skb) | ||
1476 | { | ||
1477 | struct rxfcb *fcb = (struct rxfcb *)skb->data; | ||
1478 | |||
1479 | /* Remove the FCB from the skb */ | ||
1480 | skb_pull(skb, GMAC_FCB_LEN); | ||
1481 | |||
1482 | return fcb; | ||
1483 | } | ||
1221 | 1484 | ||
1222 | /* gfar_process_frame() -- handle one incoming packet if skb | 1485 | /* gfar_process_frame() -- handle one incoming packet if skb |
1223 | * isn't NULL. */ | 1486 | * isn't NULL. */ |
@@ -1225,35 +1488,51 @@ static int gfar_process_frame(struct net_device *dev, struct sk_buff *skb, | |||
1225 | int length) | 1488 | int length) |
1226 | { | 1489 | { |
1227 | struct gfar_private *priv = netdev_priv(dev); | 1490 | struct gfar_private *priv = netdev_priv(dev); |
1491 | struct rxfcb *fcb = NULL; | ||
1228 | 1492 | ||
1229 | if (skb == NULL) { | 1493 | if (skb == NULL) { |
1230 | #ifdef BRIEF_GFAR_ERRORS | 1494 | if (netif_msg_rx_err(priv)) |
1231 | printk(KERN_WARNING "%s: Missing skb!!.\n", | 1495 | printk(KERN_WARNING "%s: Missing skb!!.\n", dev->name); |
1232 | dev->name); | ||
1233 | #endif | ||
1234 | priv->stats.rx_dropped++; | 1496 | priv->stats.rx_dropped++; |
1235 | priv->extra_stats.rx_skbmissing++; | 1497 | priv->extra_stats.rx_skbmissing++; |
1236 | } else { | 1498 | } else { |
1499 | int ret; | ||
1500 | |||
1237 | /* Prep the skb for the packet */ | 1501 | /* Prep the skb for the packet */ |
1238 | skb_put(skb, length); | 1502 | skb_put(skb, length); |
1239 | 1503 | ||
1504 | /* Grab the FCB if there is one */ | ||
1505 | if (gfar_uses_fcb(priv)) | ||
1506 | fcb = gfar_get_fcb(skb); | ||
1507 | |||
1508 | /* Remove the padded bytes, if there are any */ | ||
1509 | if (priv->padding) | ||
1510 | skb_pull(skb, priv->padding); | ||
1511 | |||
1512 | if (priv->rx_csum_enable) | ||
1513 | gfar_rx_checksum(skb, fcb); | ||
1514 | |||
1240 | /* Tell the skb what kind of packet this is */ | 1515 | /* Tell the skb what kind of packet this is */ |
1241 | skb->protocol = eth_type_trans(skb, dev); | 1516 | skb->protocol = eth_type_trans(skb, dev); |
1242 | 1517 | ||
1243 | /* Send the packet up the stack */ | 1518 | /* Send the packet up the stack */ |
1244 | if (RECEIVE(skb) == NET_RX_DROP) { | 1519 | if (unlikely(priv->vlgrp && fcb->vln)) |
1520 | ret = gfar_rx_vlan(skb, priv->vlgrp, fcb->vlctl); | ||
1521 | else | ||
1522 | ret = RECEIVE(skb); | ||
1523 | |||
1524 | if (NET_RX_DROP == ret) | ||
1245 | priv->extra_stats.kernel_dropped++; | 1525 | priv->extra_stats.kernel_dropped++; |
1246 | } | ||
1247 | } | 1526 | } |
1248 | 1527 | ||
1249 | return 0; | 1528 | return 0; |
1250 | } | 1529 | } |
1251 | 1530 | ||
1252 | /* gfar_clean_rx_ring() -- Processes each frame in the rx ring | 1531 | /* gfar_clean_rx_ring() -- Processes each frame in the rx ring |
1253 | * until the budget/quota has been reached. Returns the number | 1532 | * until the budget/quota has been reached. Returns the number |
1254 | * of frames handled | 1533 | * of frames handled |
1255 | */ | 1534 | */ |
1256 | static int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit) | 1535 | int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit) |
1257 | { | 1536 | { |
1258 | struct rxbd8 *bdp; | 1537 | struct rxbd8 *bdp; |
1259 | struct sk_buff *skb; | 1538 | struct sk_buff *skb; |
@@ -1355,9 +1634,6 @@ static int gfar_poll(struct net_device *dev, int *budget) | |||
1355 | mk_ic_value(priv->rxcount, priv->rxtime)); | 1634 | mk_ic_value(priv->rxcount, priv->rxtime)); |
1356 | else | 1635 | else |
1357 | gfar_write(&priv->regs->rxic, 0); | 1636 | gfar_write(&priv->regs->rxic, 0); |
1358 | |||
1359 | /* Signal to the ring size changer that it's safe to go */ | ||
1360 | priv->rxclean = 1; | ||
1361 | } | 1637 | } |
1362 | 1638 | ||
1363 | return (rx_work_limit < 0) ? 1 : 0; | 1639 | return (rx_work_limit < 0) ? 1 : 0; |
@@ -1393,10 +1669,8 @@ static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
1393 | if (events & IEVENT_CRL) | 1669 | if (events & IEVENT_CRL) |
1394 | priv->stats.tx_aborted_errors++; | 1670 | priv->stats.tx_aborted_errors++; |
1395 | if (events & IEVENT_XFUN) { | 1671 | if (events & IEVENT_XFUN) { |
1396 | #ifdef VERBOSE_GFAR_ERRORS | 1672 | if (netif_msg_tx_err(priv)) |
1397 | printk(KERN_WARNING "%s: tx underrun. dropped packet\n", | 1673 | printk(KERN_WARNING "%s: tx underrun. dropped packet\n", dev->name); |
1398 | dev->name); | ||
1399 | #endif | ||
1400 | priv->stats.tx_dropped++; | 1674 | priv->stats.tx_dropped++; |
1401 | priv->extra_stats.tx_underrun++; | 1675 | priv->extra_stats.tx_underrun++; |
1402 | 1676 | ||
@@ -1415,36 +1689,30 @@ static irqreturn_t gfar_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
1415 | gfar_write(&priv->regs->rstat, RSTAT_CLEAR_RHALT); | 1689 | gfar_write(&priv->regs->rstat, RSTAT_CLEAR_RHALT); |
1416 | #endif | 1690 | #endif |
1417 | 1691 | ||
1418 | #ifdef VERBOSE_GFAR_ERRORS | 1692 | if (netif_msg_rx_err(priv)) |
1419 | printk(KERN_DEBUG "%s: busy error (rhalt: %x)\n", dev->name, | 1693 | printk(KERN_DEBUG "%s: busy error (rhalt: %x)\n", |
1420 | gfar_read(&priv->regs->rstat)); | 1694 | dev->name, |
1421 | #endif | 1695 | gfar_read(&priv->regs->rstat)); |
1422 | } | 1696 | } |
1423 | if (events & IEVENT_BABR) { | 1697 | if (events & IEVENT_BABR) { |
1424 | priv->stats.rx_errors++; | 1698 | priv->stats.rx_errors++; |
1425 | priv->extra_stats.rx_babr++; | 1699 | priv->extra_stats.rx_babr++; |
1426 | 1700 | ||
1427 | #ifdef VERBOSE_GFAR_ERRORS | 1701 | if (netif_msg_rx_err(priv)) |
1428 | printk(KERN_DEBUG "%s: babbling error\n", dev->name); | 1702 | printk(KERN_DEBUG "%s: babbling error\n", dev->name); |
1429 | #endif | ||
1430 | } | 1703 | } |
1431 | if (events & IEVENT_EBERR) { | 1704 | if (events & IEVENT_EBERR) { |
1432 | priv->extra_stats.eberr++; | 1705 | priv->extra_stats.eberr++; |
1433 | #ifdef VERBOSE_GFAR_ERRORS | 1706 | if (netif_msg_rx_err(priv)) |
1434 | printk(KERN_DEBUG "%s: EBERR\n", dev->name); | 1707 | printk(KERN_DEBUG "%s: EBERR\n", dev->name); |
1435 | #endif | ||
1436 | } | ||
1437 | if (events & IEVENT_RXC) { | ||
1438 | #ifdef VERBOSE_GFAR_ERRORS | ||
1439 | printk(KERN_DEBUG "%s: control frame\n", dev->name); | ||
1440 | #endif | ||
1441 | } | 1708 | } |
1709 | if ((events & IEVENT_RXC) && (netif_msg_rx_err(priv))) | ||
1710 | printk(KERN_DEBUG "%s: control frame\n", dev->name); | ||
1442 | 1711 | ||
1443 | if (events & IEVENT_BABT) { | 1712 | if (events & IEVENT_BABT) { |
1444 | priv->extra_stats.tx_babt++; | 1713 | priv->extra_stats.tx_babt++; |
1445 | #ifdef VERBOSE_GFAR_ERRORS | 1714 | if (netif_msg_rx_err(priv)) |
1446 | printk(KERN_DEBUG "%s: babt error\n", dev->name); | 1715 | printk(KERN_DEBUG "%s: babt error\n", dev->name); |
1447 | #endif | ||
1448 | } | 1716 | } |
1449 | 1717 | ||
1450 | return IRQ_HANDLED; | 1718 | return IRQ_HANDLED; |
@@ -1510,7 +1778,7 @@ static void gfar_phy_timer(unsigned long data) | |||
1510 | * If, after GFAR_AN_TIMEOUT seconds, it has not | 1778 | * If, after GFAR_AN_TIMEOUT seconds, it has not |
1511 | * finished, we switch to forced. | 1779 | * finished, we switch to forced. |
1512 | * Either way, once the process has completed, we either | 1780 | * Either way, once the process has completed, we either |
1513 | * request the interrupt, or switch the timer over to | 1781 | * request the interrupt, or switch the timer over to |
1514 | * using gfar_phy_timer to check status */ | 1782 | * using gfar_phy_timer to check status */ |
1515 | static void gfar_phy_startup_timer(unsigned long data) | 1783 | static void gfar_phy_startup_timer(unsigned long data) |
1516 | { | 1784 | { |
@@ -1535,8 +1803,9 @@ static void gfar_phy_startup_timer(unsigned long data) | |||
1535 | 1803 | ||
1536 | /* Forcing failed! Give up */ | 1804 | /* Forcing failed! Give up */ |
1537 | if(result) { | 1805 | if(result) { |
1538 | printk(KERN_ERR "%s: Forcing failed!\n", | 1806 | if (netif_msg_link(priv)) |
1539 | mii_info->dev->name); | 1807 | printk(KERN_ERR "%s: Forcing failed!\n", |
1808 | mii_info->dev->name); | ||
1540 | return; | 1809 | return; |
1541 | } | 1810 | } |
1542 | } | 1811 | } |
@@ -1546,16 +1815,17 @@ static void gfar_phy_startup_timer(unsigned long data) | |||
1546 | 1815 | ||
1547 | /* Grab the PHY interrupt, if necessary/possible */ | 1816 | /* Grab the PHY interrupt, if necessary/possible */ |
1548 | if (priv->einfo->board_flags & FSL_GIANFAR_BRD_HAS_PHY_INTR) { | 1817 | if (priv->einfo->board_flags & FSL_GIANFAR_BRD_HAS_PHY_INTR) { |
1549 | if (request_irq(priv->einfo->interruptPHY, | 1818 | if (request_irq(priv->einfo->interruptPHY, |
1550 | phy_interrupt, | 1819 | phy_interrupt, |
1551 | SA_SHIRQ, | 1820 | SA_SHIRQ, |
1552 | "phy_interrupt", | 1821 | "phy_interrupt", |
1553 | mii_info->dev) < 0) { | 1822 | mii_info->dev) < 0) { |
1554 | printk(KERN_ERR "%s: Can't get IRQ %d (PHY)\n", | 1823 | if (netif_msg_intr(priv)) |
1555 | mii_info->dev->name, | 1824 | printk(KERN_ERR "%s: Can't get IRQ %d (PHY)\n", |
1825 | mii_info->dev->name, | ||
1556 | priv->einfo->interruptPHY); | 1826 | priv->einfo->interruptPHY); |
1557 | } else { | 1827 | } else { |
1558 | mii_configure_phy_interrupt(priv->mii_info, | 1828 | mii_configure_phy_interrupt(priv->mii_info, |
1559 | MII_INTERRUPT_ENABLED); | 1829 | MII_INTERRUPT_ENABLED); |
1560 | return; | 1830 | return; |
1561 | } | 1831 | } |
@@ -1592,15 +1862,17 @@ static void adjust_link(struct net_device *dev) | |||
1592 | tempval &= ~(MACCFG2_FULL_DUPLEX); | 1862 | tempval &= ~(MACCFG2_FULL_DUPLEX); |
1593 | gfar_write(®s->maccfg2, tempval); | 1863 | gfar_write(®s->maccfg2, tempval); |
1594 | 1864 | ||
1595 | printk(KERN_INFO "%s: Half Duplex\n", | 1865 | if (netif_msg_link(priv)) |
1596 | dev->name); | 1866 | printk(KERN_INFO "%s: Half Duplex\n", |
1867 | dev->name); | ||
1597 | } else { | 1868 | } else { |
1598 | tempval = gfar_read(®s->maccfg2); | 1869 | tempval = gfar_read(®s->maccfg2); |
1599 | tempval |= MACCFG2_FULL_DUPLEX; | 1870 | tempval |= MACCFG2_FULL_DUPLEX; |
1600 | gfar_write(®s->maccfg2, tempval); | 1871 | gfar_write(®s->maccfg2, tempval); |
1601 | 1872 | ||
1602 | printk(KERN_INFO "%s: Full Duplex\n", | 1873 | if (netif_msg_link(priv)) |
1603 | dev->name); | 1874 | printk(KERN_INFO "%s: Full Duplex\n", |
1875 | dev->name); | ||
1604 | } | 1876 | } |
1605 | 1877 | ||
1606 | priv->oldduplex = mii_info->duplex; | 1878 | priv->oldduplex = mii_info->duplex; |
@@ -1622,27 +1894,32 @@ static void adjust_link(struct net_device *dev) | |||
1622 | gfar_write(®s->maccfg2, tempval); | 1894 | gfar_write(®s->maccfg2, tempval); |
1623 | break; | 1895 | break; |
1624 | default: | 1896 | default: |
1625 | printk(KERN_WARNING | 1897 | if (netif_msg_link(priv)) |
1626 | "%s: Ack! Speed (%d) is not 10/100/1000!\n", | 1898 | printk(KERN_WARNING |
1627 | dev->name, mii_info->speed); | 1899 | "%s: Ack! Speed (%d) is not 10/100/1000!\n", |
1900 | dev->name, mii_info->speed); | ||
1628 | break; | 1901 | break; |
1629 | } | 1902 | } |
1630 | 1903 | ||
1631 | printk(KERN_INFO "%s: Speed %dBT\n", dev->name, | 1904 | if (netif_msg_link(priv)) |
1632 | mii_info->speed); | 1905 | printk(KERN_INFO "%s: Speed %dBT\n", dev->name, |
1906 | mii_info->speed); | ||
1633 | 1907 | ||
1634 | priv->oldspeed = mii_info->speed; | 1908 | priv->oldspeed = mii_info->speed; |
1635 | } | 1909 | } |
1636 | 1910 | ||
1637 | if (!priv->oldlink) { | 1911 | if (!priv->oldlink) { |
1638 | printk(KERN_INFO "%s: Link is up\n", dev->name); | 1912 | if (netif_msg_link(priv)) |
1913 | printk(KERN_INFO "%s: Link is up\n", dev->name); | ||
1639 | priv->oldlink = 1; | 1914 | priv->oldlink = 1; |
1640 | netif_carrier_on(dev); | 1915 | netif_carrier_on(dev); |
1641 | netif_schedule(dev); | 1916 | netif_schedule(dev); |
1642 | } | 1917 | } |
1643 | } else { | 1918 | } else { |
1644 | if (priv->oldlink) { | 1919 | if (priv->oldlink) { |
1645 | printk(KERN_INFO "%s: Link is down\n", dev->name); | 1920 | if (netif_msg_link(priv)) |
1921 | printk(KERN_INFO "%s: Link is down\n", | ||
1922 | dev->name); | ||
1646 | priv->oldlink = 0; | 1923 | priv->oldlink = 0; |
1647 | priv->oldspeed = 0; | 1924 | priv->oldspeed = 0; |
1648 | priv->oldduplex = -1; | 1925 | priv->oldduplex = -1; |
@@ -1664,8 +1941,9 @@ static void gfar_set_multi(struct net_device *dev) | |||
1664 | u32 tempval; | 1941 | u32 tempval; |
1665 | 1942 | ||
1666 | if(dev->flags & IFF_PROMISC) { | 1943 | if(dev->flags & IFF_PROMISC) { |
1667 | printk(KERN_INFO "%s: Entering promiscuous mode.\n", | 1944 | if (netif_msg_drv(priv)) |
1668 | dev->name); | 1945 | printk(KERN_INFO "%s: Entering promiscuous mode.\n", |
1946 | dev->name); | ||
1669 | /* Set RCTRL to PROM */ | 1947 | /* Set RCTRL to PROM */ |
1670 | tempval = gfar_read(®s->rctrl); | 1948 | tempval = gfar_read(®s->rctrl); |
1671 | tempval |= RCTRL_PROM; | 1949 | tempval |= RCTRL_PROM; |
@@ -1679,6 +1957,14 @@ static void gfar_set_multi(struct net_device *dev) | |||
1679 | 1957 | ||
1680 | if(dev->flags & IFF_ALLMULTI) { | 1958 | if(dev->flags & IFF_ALLMULTI) { |
1681 | /* Set the hash to rx all multicast frames */ | 1959 | /* Set the hash to rx all multicast frames */ |
1960 | gfar_write(®s->igaddr0, 0xffffffff); | ||
1961 | gfar_write(®s->igaddr1, 0xffffffff); | ||
1962 | gfar_write(®s->igaddr2, 0xffffffff); | ||
1963 | gfar_write(®s->igaddr3, 0xffffffff); | ||
1964 | gfar_write(®s->igaddr4, 0xffffffff); | ||
1965 | gfar_write(®s->igaddr5, 0xffffffff); | ||
1966 | gfar_write(®s->igaddr6, 0xffffffff); | ||
1967 | gfar_write(®s->igaddr7, 0xffffffff); | ||
1682 | gfar_write(®s->gaddr0, 0xffffffff); | 1968 | gfar_write(®s->gaddr0, 0xffffffff); |
1683 | gfar_write(®s->gaddr1, 0xffffffff); | 1969 | gfar_write(®s->gaddr1, 0xffffffff); |
1684 | gfar_write(®s->gaddr2, 0xffffffff); | 1970 | gfar_write(®s->gaddr2, 0xffffffff); |
@@ -1689,6 +1975,14 @@ static void gfar_set_multi(struct net_device *dev) | |||
1689 | gfar_write(®s->gaddr7, 0xffffffff); | 1975 | gfar_write(®s->gaddr7, 0xffffffff); |
1690 | } else { | 1976 | } else { |
1691 | /* zero out the hash */ | 1977 | /* zero out the hash */ |
1978 | gfar_write(®s->igaddr0, 0x0); | ||
1979 | gfar_write(®s->igaddr1, 0x0); | ||
1980 | gfar_write(®s->igaddr2, 0x0); | ||
1981 | gfar_write(®s->igaddr3, 0x0); | ||
1982 | gfar_write(®s->igaddr4, 0x0); | ||
1983 | gfar_write(®s->igaddr5, 0x0); | ||
1984 | gfar_write(®s->igaddr6, 0x0); | ||
1985 | gfar_write(®s->igaddr7, 0x0); | ||
1692 | gfar_write(®s->gaddr0, 0x0); | 1986 | gfar_write(®s->gaddr0, 0x0); |
1693 | gfar_write(®s->gaddr1, 0x0); | 1987 | gfar_write(®s->gaddr1, 0x0); |
1694 | gfar_write(®s->gaddr2, 0x0); | 1988 | gfar_write(®s->gaddr2, 0x0); |
@@ -1727,16 +2021,15 @@ static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr) | |||
1727 | { | 2021 | { |
1728 | u32 tempval; | 2022 | u32 tempval; |
1729 | struct gfar_private *priv = netdev_priv(dev); | 2023 | struct gfar_private *priv = netdev_priv(dev); |
1730 | struct gfar *regs = priv->regs; | ||
1731 | u32 *hash = ®s->gaddr0; | ||
1732 | u32 result = ether_crc(MAC_ADDR_LEN, addr); | 2024 | u32 result = ether_crc(MAC_ADDR_LEN, addr); |
1733 | u8 whichreg = ((result >> 29) & 0x7); | 2025 | int width = priv->hash_width; |
1734 | u8 whichbit = ((result >> 24) & 0x1f); | 2026 | u8 whichbit = (result >> (32 - width)) & 0x1f; |
2027 | u8 whichreg = result >> (32 - width + 5); | ||
1735 | u32 value = (1 << (31-whichbit)); | 2028 | u32 value = (1 << (31-whichbit)); |
1736 | 2029 | ||
1737 | tempval = gfar_read(&hash[whichreg]); | 2030 | tempval = gfar_read(priv->hash_regs[whichreg]); |
1738 | tempval |= value; | 2031 | tempval |= value; |
1739 | gfar_write(&hash[whichreg], tempval); | 2032 | gfar_write(priv->hash_regs[whichreg], tempval); |
1740 | 2033 | ||
1741 | return; | 2034 | return; |
1742 | } | 2035 | } |
@@ -1754,10 +2047,9 @@ static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs) | |||
1754 | gfar_write(&priv->regs->ievent, IEVENT_ERR_MASK); | 2047 | gfar_write(&priv->regs->ievent, IEVENT_ERR_MASK); |
1755 | 2048 | ||
1756 | /* Hmm... */ | 2049 | /* Hmm... */ |
1757 | #if defined (BRIEF_GFAR_ERRORS) || defined (VERBOSE_GFAR_ERRORS) | 2050 | if (netif_msg_rx_err(priv) || netif_msg_tx_err(priv)) |
1758 | printk(KERN_DEBUG "%s: error interrupt (ievent=0x%08x imask=0x%08x)\n", | 2051 | printk(KERN_DEBUG "%s: error interrupt (ievent=0x%08x imask=0x%08x)\n", |
1759 | dev->name, events, gfar_read(&priv->regs->imask)); | 2052 | dev->name, events, gfar_read(&priv->regs->imask)); |
1760 | #endif | ||
1761 | 2053 | ||
1762 | /* Update the error counters */ | 2054 | /* Update the error counters */ |
1763 | if (events & IEVENT_TXE) { | 2055 | if (events & IEVENT_TXE) { |
@@ -1768,19 +2060,17 @@ static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs) | |||
1768 | if (events & IEVENT_CRL) | 2060 | if (events & IEVENT_CRL) |
1769 | priv->stats.tx_aborted_errors++; | 2061 | priv->stats.tx_aborted_errors++; |
1770 | if (events & IEVENT_XFUN) { | 2062 | if (events & IEVENT_XFUN) { |
1771 | #ifdef VERBOSE_GFAR_ERRORS | 2063 | if (netif_msg_tx_err(priv)) |
1772 | printk(KERN_DEBUG "%s: underrun. packet dropped.\n", | 2064 | printk(KERN_DEBUG "%s: underrun. packet dropped.\n", |
1773 | dev->name); | 2065 | dev->name); |
1774 | #endif | ||
1775 | priv->stats.tx_dropped++; | 2066 | priv->stats.tx_dropped++; |
1776 | priv->extra_stats.tx_underrun++; | 2067 | priv->extra_stats.tx_underrun++; |
1777 | 2068 | ||
1778 | /* Reactivate the Tx Queues */ | 2069 | /* Reactivate the Tx Queues */ |
1779 | gfar_write(&priv->regs->tstat, TSTAT_CLEAR_THALT); | 2070 | gfar_write(&priv->regs->tstat, TSTAT_CLEAR_THALT); |
1780 | } | 2071 | } |
1781 | #ifdef VERBOSE_GFAR_ERRORS | 2072 | if (netif_msg_tx_err(priv)) |
1782 | printk(KERN_DEBUG "%s: Transmit Error\n", dev->name); | 2073 | printk(KERN_DEBUG "%s: Transmit Error\n", dev->name); |
1783 | #endif | ||
1784 | } | 2074 | } |
1785 | if (events & IEVENT_BSY) { | 2075 | if (events & IEVENT_BSY) { |
1786 | priv->stats.rx_errors++; | 2076 | priv->stats.rx_errors++; |
@@ -1793,35 +2083,31 @@ static irqreturn_t gfar_error(int irq, void *dev_id, struct pt_regs *regs) | |||
1793 | gfar_write(&priv->regs->rstat, RSTAT_CLEAR_RHALT); | 2083 | gfar_write(&priv->regs->rstat, RSTAT_CLEAR_RHALT); |
1794 | #endif | 2084 | #endif |
1795 | 2085 | ||
1796 | #ifdef VERBOSE_GFAR_ERRORS | 2086 | if (netif_msg_rx_err(priv)) |
1797 | printk(KERN_DEBUG "%s: busy error (rhalt: %x)\n", dev->name, | 2087 | printk(KERN_DEBUG "%s: busy error (rhalt: %x)\n", |
1798 | gfar_read(&priv->regs->rstat)); | 2088 | dev->name, |
1799 | #endif | 2089 | gfar_read(&priv->regs->rstat)); |
1800 | } | 2090 | } |
1801 | if (events & IEVENT_BABR) { | 2091 | if (events & IEVENT_BABR) { |
1802 | priv->stats.rx_errors++; | 2092 | priv->stats.rx_errors++; |
1803 | priv->extra_stats.rx_babr++; | 2093 | priv->extra_stats.rx_babr++; |
1804 | 2094 | ||
1805 | #ifdef VERBOSE_GFAR_ERRORS | 2095 | if (netif_msg_rx_err(priv)) |
1806 | printk(KERN_DEBUG "%s: babbling error\n", dev->name); | 2096 | printk(KERN_DEBUG "%s: babbling error\n", dev->name); |
1807 | #endif | ||
1808 | } | 2097 | } |
1809 | if (events & IEVENT_EBERR) { | 2098 | if (events & IEVENT_EBERR) { |
1810 | priv->extra_stats.eberr++; | 2099 | priv->extra_stats.eberr++; |
1811 | #ifdef VERBOSE_GFAR_ERRORS | 2100 | if (netif_msg_rx_err(priv)) |
1812 | printk(KERN_DEBUG "%s: EBERR\n", dev->name); | 2101 | printk(KERN_DEBUG "%s: EBERR\n", dev->name); |
1813 | #endif | ||
1814 | } | 2102 | } |
1815 | if (events & IEVENT_RXC) | 2103 | if ((events & IEVENT_RXC) && netif_msg_rx_status(priv)) |
1816 | #ifdef VERBOSE_GFAR_ERRORS | 2104 | if (netif_msg_rx_status(priv)) |
1817 | printk(KERN_DEBUG "%s: control frame\n", dev->name); | 2105 | printk(KERN_DEBUG "%s: control frame\n", dev->name); |
1818 | #endif | ||
1819 | 2106 | ||
1820 | if (events & IEVENT_BABT) { | 2107 | if (events & IEVENT_BABT) { |
1821 | priv->extra_stats.tx_babt++; | 2108 | priv->extra_stats.tx_babt++; |
1822 | #ifdef VERBOSE_GFAR_ERRORS | 2109 | if (netif_msg_tx_err(priv)) |
1823 | printk(KERN_DEBUG "%s: babt error\n", dev->name); | 2110 | printk(KERN_DEBUG "%s: babt error\n", dev->name); |
1824 | #endif | ||
1825 | } | 2111 | } |
1826 | return IRQ_HANDLED; | 2112 | return IRQ_HANDLED; |
1827 | } | 2113 | } |
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index c2f783a6a9fa..28af087d9fbb 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * drivers/net/gianfar.h | 2 | * drivers/net/gianfar.h |
3 | * | 3 | * |
4 | * Gianfar Ethernet Driver | 4 | * Gianfar Ethernet Driver |
@@ -53,6 +53,12 @@ | |||
53 | /* The maximum number of packets to be handled in one call of gfar_poll */ | 53 | /* The maximum number of packets to be handled in one call of gfar_poll */ |
54 | #define GFAR_DEV_WEIGHT 64 | 54 | #define GFAR_DEV_WEIGHT 64 |
55 | 55 | ||
56 | /* Length for FCB */ | ||
57 | #define GMAC_FCB_LEN 8 | ||
58 | |||
59 | /* Default padding amount */ | ||
60 | #define DEFAULT_PADDING 2 | ||
61 | |||
56 | /* Number of bytes to align the rx bufs to */ | 62 | /* Number of bytes to align the rx bufs to */ |
57 | #define RXBUF_ALIGNMENT 64 | 63 | #define RXBUF_ALIGNMENT 64 |
58 | 64 | ||
@@ -91,7 +97,7 @@ extern const char gfar_driver_version[]; | |||
91 | #define JUMBO_FRAME_SIZE 9600 | 97 | #define JUMBO_FRAME_SIZE 9600 |
92 | 98 | ||
93 | /* Latency of interface clock in nanoseconds */ | 99 | /* Latency of interface clock in nanoseconds */ |
94 | /* Interface clock latency , in this case, means the | 100 | /* Interface clock latency , in this case, means the |
95 | * time described by a value of 1 in the interrupt | 101 | * time described by a value of 1 in the interrupt |
96 | * coalescing registers' time fields. Since those fields | 102 | * coalescing registers' time fields. Since those fields |
97 | * refer to the time it takes for 64 clocks to pass, the | 103 | * refer to the time it takes for 64 clocks to pass, the |
@@ -166,9 +172,28 @@ extern const char gfar_driver_version[]; | |||
166 | mk_ic_icft(count) | \ | 172 | mk_ic_icft(count) | \ |
167 | mk_ic_ictt(time)) | 173 | mk_ic_ictt(time)) |
168 | 174 | ||
175 | #define RCTRL_PAL_MASK 0x001f0000 | ||
176 | #define RCTRL_VLEX 0x00002000 | ||
177 | #define RCTRL_FILREN 0x00001000 | ||
178 | #define RCTRL_GHTX 0x00000400 | ||
179 | #define RCTRL_IPCSEN 0x00000200 | ||
180 | #define RCTRL_TUCSEN 0x00000100 | ||
181 | #define RCTRL_PRSDEP_MASK 0x000000c0 | ||
182 | #define RCTRL_PRSDEP_INIT 0x000000c0 | ||
169 | #define RCTRL_PROM 0x00000008 | 183 | #define RCTRL_PROM 0x00000008 |
184 | #define RCTRL_CHECKSUMMING (RCTRL_IPCSEN \ | ||
185 | | RCTRL_TUCSEN | RCTRL_PRSDEP_INIT) | ||
186 | #define RCTRL_EXTHASH (RCTRL_GHTX) | ||
187 | #define RCTRL_VLAN (RCTRL_PRSDEP_INIT) | ||
188 | |||
189 | |||
170 | #define RSTAT_CLEAR_RHALT 0x00800000 | 190 | #define RSTAT_CLEAR_RHALT 0x00800000 |
171 | 191 | ||
192 | #define TCTRL_IPCSEN 0x00004000 | ||
193 | #define TCTRL_TUCSEN 0x00002000 | ||
194 | #define TCTRL_VLINS 0x00001000 | ||
195 | #define TCTRL_INIT_CSUM (TCTRL_TUCSEN | TCTRL_IPCSEN) | ||
196 | |||
172 | #define IEVENT_INIT_CLEAR 0xffffffff | 197 | #define IEVENT_INIT_CLEAR 0xffffffff |
173 | #define IEVENT_BABR 0x80000000 | 198 | #define IEVENT_BABR 0x80000000 |
174 | #define IEVENT_RXC 0x40000000 | 199 | #define IEVENT_RXC 0x40000000 |
@@ -187,12 +212,16 @@ extern const char gfar_driver_version[]; | |||
187 | #define IEVENT_RXB0 0x00008000 | 212 | #define IEVENT_RXB0 0x00008000 |
188 | #define IEVENT_GRSC 0x00000100 | 213 | #define IEVENT_GRSC 0x00000100 |
189 | #define IEVENT_RXF0 0x00000080 | 214 | #define IEVENT_RXF0 0x00000080 |
215 | #define IEVENT_FIR 0x00000008 | ||
216 | #define IEVENT_FIQ 0x00000004 | ||
217 | #define IEVENT_DPE 0x00000002 | ||
218 | #define IEVENT_PERR 0x00000001 | ||
190 | #define IEVENT_RX_MASK (IEVENT_RXB0 | IEVENT_RXF0) | 219 | #define IEVENT_RX_MASK (IEVENT_RXB0 | IEVENT_RXF0) |
191 | #define IEVENT_TX_MASK (IEVENT_TXB | IEVENT_TXF) | 220 | #define IEVENT_TX_MASK (IEVENT_TXB | IEVENT_TXF) |
192 | #define IEVENT_ERR_MASK \ | 221 | #define IEVENT_ERR_MASK \ |
193 | (IEVENT_RXC | IEVENT_BSY | IEVENT_EBERR | IEVENT_MSRO | \ | 222 | (IEVENT_RXC | IEVENT_BSY | IEVENT_EBERR | IEVENT_MSRO | \ |
194 | IEVENT_BABT | IEVENT_TXC | IEVENT_TXE | IEVENT_LC \ | 223 | IEVENT_BABT | IEVENT_TXC | IEVENT_TXE | IEVENT_LC \ |
195 | | IEVENT_CRL | IEVENT_XFUN) | 224 | | IEVENT_CRL | IEVENT_XFUN | IEVENT_DPE | IEVENT_PERR) |
196 | 225 | ||
197 | #define IMASK_INIT_CLEAR 0x00000000 | 226 | #define IMASK_INIT_CLEAR 0x00000000 |
198 | #define IMASK_BABR 0x80000000 | 227 | #define IMASK_BABR 0x80000000 |
@@ -212,10 +241,15 @@ extern const char gfar_driver_version[]; | |||
212 | #define IMASK_RXB0 0x00008000 | 241 | #define IMASK_RXB0 0x00008000 |
213 | #define IMASK_GTSC 0x00000100 | 242 | #define IMASK_GTSC 0x00000100 |
214 | #define IMASK_RXFEN0 0x00000080 | 243 | #define IMASK_RXFEN0 0x00000080 |
244 | #define IMASK_FIR 0x00000008 | ||
245 | #define IMASK_FIQ 0x00000004 | ||
246 | #define IMASK_DPE 0x00000002 | ||
247 | #define IMASK_PERR 0x00000001 | ||
215 | #define IMASK_RX_DISABLED ~(IMASK_RXFEN0 | IMASK_BSY) | 248 | #define IMASK_RX_DISABLED ~(IMASK_RXFEN0 | IMASK_BSY) |
216 | #define IMASK_DEFAULT (IMASK_TXEEN | IMASK_TXFEN | IMASK_TXBEN | \ | 249 | #define IMASK_DEFAULT (IMASK_TXEEN | IMASK_TXFEN | IMASK_TXBEN | \ |
217 | IMASK_RXFEN0 | IMASK_BSY | IMASK_EBERR | IMASK_BABR | \ | 250 | IMASK_RXFEN0 | IMASK_BSY | IMASK_EBERR | IMASK_BABR | \ |
218 | IMASK_XFUN | IMASK_RXC | IMASK_BABT) | 251 | IMASK_XFUN | IMASK_RXC | IMASK_BABT | IMASK_DPE \ |
252 | | IMASK_PERR) | ||
219 | 253 | ||
220 | 254 | ||
221 | /* Attribute fields */ | 255 | /* Attribute fields */ |
@@ -254,6 +288,18 @@ extern const char gfar_driver_version[]; | |||
254 | #define TXBD_RETRYLIMIT 0x0040 | 288 | #define TXBD_RETRYLIMIT 0x0040 |
255 | #define TXBD_RETRYCOUNTMASK 0x003c | 289 | #define TXBD_RETRYCOUNTMASK 0x003c |
256 | #define TXBD_UNDERRUN 0x0002 | 290 | #define TXBD_UNDERRUN 0x0002 |
291 | #define TXBD_TOE 0x0002 | ||
292 | |||
293 | /* Tx FCB param bits */ | ||
294 | #define TXFCB_VLN 0x80 | ||
295 | #define TXFCB_IP 0x40 | ||
296 | #define TXFCB_IP6 0x20 | ||
297 | #define TXFCB_TUP 0x10 | ||
298 | #define TXFCB_UDP 0x08 | ||
299 | #define TXFCB_CIP 0x04 | ||
300 | #define TXFCB_CTU 0x02 | ||
301 | #define TXFCB_NPH 0x01 | ||
302 | #define TXFCB_DEFAULT (TXFCB_IP|TXFCB_TUP|TXFCB_CTU|TXFCB_NPH) | ||
257 | 303 | ||
258 | /* RxBD status field bits */ | 304 | /* RxBD status field bits */ |
259 | #define RXBD_EMPTY 0x8000 | 305 | #define RXBD_EMPTY 0x8000 |
@@ -273,6 +319,18 @@ extern const char gfar_driver_version[]; | |||
273 | #define RXBD_TRUNCATED 0x0001 | 319 | #define RXBD_TRUNCATED 0x0001 |
274 | #define RXBD_STATS 0x01ff | 320 | #define RXBD_STATS 0x01ff |
275 | 321 | ||
322 | /* Rx FCB status field bits */ | ||
323 | #define RXFCB_VLN 0x8000 | ||
324 | #define RXFCB_IP 0x4000 | ||
325 | #define RXFCB_IP6 0x2000 | ||
326 | #define RXFCB_TUP 0x1000 | ||
327 | #define RXFCB_CIP 0x0800 | ||
328 | #define RXFCB_CTU 0x0400 | ||
329 | #define RXFCB_EIP 0x0200 | ||
330 | #define RXFCB_ETU 0x0100 | ||
331 | #define RXFCB_PERR_MASK 0x000c | ||
332 | #define RXFCB_PERR_BADL3 0x0008 | ||
333 | |||
276 | struct txbd8 | 334 | struct txbd8 |
277 | { | 335 | { |
278 | u16 status; /* Status Fields */ | 336 | u16 status; /* Status Fields */ |
@@ -280,6 +338,22 @@ struct txbd8 | |||
280 | u32 bufPtr; /* Buffer Pointer */ | 338 | u32 bufPtr; /* Buffer Pointer */ |
281 | }; | 339 | }; |
282 | 340 | ||
341 | struct txfcb { | ||
342 | u8 vln:1, | ||
343 | ip:1, | ||
344 | ip6:1, | ||
345 | tup:1, | ||
346 | udp:1, | ||
347 | cip:1, | ||
348 | ctu:1, | ||
349 | nph:1; | ||
350 | u8 reserved; | ||
351 | u8 l4os; /* Level 4 Header Offset */ | ||
352 | u8 l3os; /* Level 3 Header Offset */ | ||
353 | u16 phcs; /* Pseudo-header Checksum */ | ||
354 | u16 vlctl; /* VLAN control word */ | ||
355 | }; | ||
356 | |||
283 | struct rxbd8 | 357 | struct rxbd8 |
284 | { | 358 | { |
285 | u16 status; /* Status Fields */ | 359 | u16 status; /* Status Fields */ |
@@ -287,6 +361,21 @@ struct rxbd8 | |||
287 | u32 bufPtr; /* Buffer Pointer */ | 361 | u32 bufPtr; /* Buffer Pointer */ |
288 | }; | 362 | }; |
289 | 363 | ||
364 | struct rxfcb { | ||
365 | u16 vln:1, | ||
366 | ip:1, | ||
367 | ip6:1, | ||
368 | tup:1, | ||
369 | cip:1, | ||
370 | ctu:1, | ||
371 | eip:1, | ||
372 | etu:1; | ||
373 | u8 rq; /* Receive Queue index */ | ||
374 | u8 pro; /* Layer 4 Protocol */ | ||
375 | u16 reserved; | ||
376 | u16 vlctl; /* VLAN control word */ | ||
377 | }; | ||
378 | |||
290 | struct rmon_mib | 379 | struct rmon_mib |
291 | { | 380 | { |
292 | u32 tr64; /* 0x.680 - Transmit and Receive 64-byte Frame Counter */ | 381 | u32 tr64; /* 0x.680 - Transmit and Receive 64-byte Frame Counter */ |
@@ -371,90 +460,191 @@ struct gfar_stats { | |||
371 | 460 | ||
372 | 461 | ||
373 | struct gfar { | 462 | struct gfar { |
374 | u8 res1[16]; | 463 | u32 tsec_id; /* 0x.000 - Controller ID register */ |
375 | u32 ievent; /* 0x.010 - Interrupt Event Register */ | 464 | u8 res1[12]; |
376 | u32 imask; /* 0x.014 - Interrupt Mask Register */ | 465 | u32 ievent; /* 0x.010 - Interrupt Event Register */ |
377 | u32 edis; /* 0x.018 - Error Disabled Register */ | 466 | u32 imask; /* 0x.014 - Interrupt Mask Register */ |
467 | u32 edis; /* 0x.018 - Error Disabled Register */ | ||
378 | u8 res2[4]; | 468 | u8 res2[4]; |
379 | u32 ecntrl; /* 0x.020 - Ethernet Control Register */ | 469 | u32 ecntrl; /* 0x.020 - Ethernet Control Register */ |
380 | u32 minflr; /* 0x.024 - Minimum Frame Length Register */ | 470 | u32 minflr; /* 0x.024 - Minimum Frame Length Register */ |
381 | u32 ptv; /* 0x.028 - Pause Time Value Register */ | 471 | u32 ptv; /* 0x.028 - Pause Time Value Register */ |
382 | u32 dmactrl; /* 0x.02c - DMA Control Register */ | 472 | u32 dmactrl; /* 0x.02c - DMA Control Register */ |
383 | u32 tbipa; /* 0x.030 - TBI PHY Address Register */ | 473 | u32 tbipa; /* 0x.030 - TBI PHY Address Register */ |
384 | u8 res3[88]; | 474 | u8 res3[88]; |
385 | u32 fifo_tx_thr; /* 0x.08c - FIFO transmit threshold register */ | 475 | u32 fifo_tx_thr; /* 0x.08c - FIFO transmit threshold register */ |
386 | u8 res4[8]; | 476 | u8 res4[8]; |
387 | u32 fifo_tx_starve; /* 0x.098 - FIFO transmit starve register */ | 477 | u32 fifo_tx_starve; /* 0x.098 - FIFO transmit starve register */ |
388 | u32 fifo_tx_starve_shutoff; /* 0x.09c - FIFO transmit starve shutoff register */ | 478 | u32 fifo_tx_starve_shutoff; /* 0x.09c - FIFO transmit starve shutoff register */ |
389 | u8 res5[96]; | 479 | u8 res5[4]; |
390 | u32 tctrl; /* 0x.100 - Transmit Control Register */ | 480 | u32 fifo_rx_pause; /* 0x.0a4 - FIFO receive pause threshold register */ |
391 | u32 tstat; /* 0x.104 - Transmit Status Register */ | 481 | u32 fifo_rx_alarm; /* 0x.0a8 - FIFO receive alarm threshold register */ |
392 | u8 res6[4]; | 482 | u8 res6[84]; |
393 | u32 tbdlen; /* 0x.10c - Transmit Buffer Descriptor Data Length Register */ | 483 | u32 tctrl; /* 0x.100 - Transmit Control Register */ |
394 | u32 txic; /* 0x.110 - Transmit Interrupt Coalescing Configuration Register */ | 484 | u32 tstat; /* 0x.104 - Transmit Status Register */ |
395 | u8 res7[16]; | 485 | u32 dfvlan; /* 0x.108 - Default VLAN Control word */ |
396 | u32 ctbptr; /* 0x.124 - Current Transmit Buffer Descriptor Pointer Register */ | 486 | u32 tbdlen; /* 0x.10c - Transmit Buffer Descriptor Data Length Register */ |
397 | u8 res8[92]; | 487 | u32 txic; /* 0x.110 - Transmit Interrupt Coalescing Configuration Register */ |
398 | u32 tbptr; /* 0x.184 - Transmit Buffer Descriptor Pointer Low Register */ | 488 | u32 tqueue; /* 0x.114 - Transmit queue control register */ |
399 | u8 res9[124]; | 489 | u8 res7[40]; |
400 | u32 tbase; /* 0x.204 - Transmit Descriptor Base Address Register */ | 490 | u32 tr03wt; /* 0x.140 - TxBD Rings 0-3 round-robin weightings */ |
401 | u8 res10[168]; | 491 | u32 tr47wt; /* 0x.144 - TxBD Rings 4-7 round-robin weightings */ |
402 | u32 ostbd; /* 0x.2b0 - Out-of-Sequence Transmit Buffer Descriptor Register */ | 492 | u8 res8[52]; |
403 | u32 ostbdp; /* 0x.2b4 - Out-of-Sequence Transmit Data Buffer Pointer Register */ | 493 | u32 tbdbph; /* 0x.17c - Tx data buffer pointer high */ |
404 | u8 res11[72]; | 494 | u8 res9a[4]; |
405 | u32 rctrl; /* 0x.300 - Receive Control Register */ | 495 | u32 tbptr0; /* 0x.184 - TxBD Pointer for ring 0 */ |
406 | u32 rstat; /* 0x.304 - Receive Status Register */ | 496 | u8 res9b[4]; |
407 | u8 res12[4]; | 497 | u32 tbptr1; /* 0x.18c - TxBD Pointer for ring 1 */ |
408 | u32 rbdlen; /* 0x.30c - RxBD Data Length Register */ | 498 | u8 res9c[4]; |
409 | u32 rxic; /* 0x.310 - Receive Interrupt Coalescing Configuration Register */ | 499 | u32 tbptr2; /* 0x.194 - TxBD Pointer for ring 2 */ |
410 | u8 res13[16]; | 500 | u8 res9d[4]; |
411 | u32 crbptr; /* 0x.324 - Current Receive Buffer Descriptor Pointer */ | 501 | u32 tbptr3; /* 0x.19c - TxBD Pointer for ring 3 */ |
412 | u8 res14[24]; | 502 | u8 res9e[4]; |
413 | u32 mrblr; /* 0x.340 - Maximum Receive Buffer Length Register */ | 503 | u32 tbptr4; /* 0x.1a4 - TxBD Pointer for ring 4 */ |
414 | u8 res15[64]; | 504 | u8 res9f[4]; |
415 | u32 rbptr; /* 0x.384 - Receive Buffer Descriptor Pointer */ | 505 | u32 tbptr5; /* 0x.1ac - TxBD Pointer for ring 5 */ |
416 | u8 res16[124]; | 506 | u8 res9g[4]; |
417 | u32 rbase; /* 0x.404 - Receive Descriptor Base Address */ | 507 | u32 tbptr6; /* 0x.1b4 - TxBD Pointer for ring 6 */ |
418 | u8 res17[248]; | 508 | u8 res9h[4]; |
419 | u32 maccfg1; /* 0x.500 - MAC Configuration 1 Register */ | 509 | u32 tbptr7; /* 0x.1bc - TxBD Pointer for ring 7 */ |
420 | u32 maccfg2; /* 0x.504 - MAC Configuration 2 Register */ | 510 | u8 res9[64]; |
421 | u32 ipgifg; /* 0x.508 - Inter Packet Gap/Inter Frame Gap Register */ | 511 | u32 tbaseh; /* 0x.200 - TxBD base address high */ |
422 | u32 hafdup; /* 0x.50c - Half Duplex Register */ | 512 | u32 tbase0; /* 0x.204 - TxBD Base Address of ring 0 */ |
423 | u32 maxfrm; /* 0x.510 - Maximum Frame Length Register */ | 513 | u8 res10a[4]; |
514 | u32 tbase1; /* 0x.20c - TxBD Base Address of ring 1 */ | ||
515 | u8 res10b[4]; | ||
516 | u32 tbase2; /* 0x.214 - TxBD Base Address of ring 2 */ | ||
517 | u8 res10c[4]; | ||
518 | u32 tbase3; /* 0x.21c - TxBD Base Address of ring 3 */ | ||
519 | u8 res10d[4]; | ||
520 | u32 tbase4; /* 0x.224 - TxBD Base Address of ring 4 */ | ||
521 | u8 res10e[4]; | ||
522 | u32 tbase5; /* 0x.22c - TxBD Base Address of ring 5 */ | ||
523 | u8 res10f[4]; | ||
524 | u32 tbase6; /* 0x.234 - TxBD Base Address of ring 6 */ | ||
525 | u8 res10g[4]; | ||
526 | u32 tbase7; /* 0x.23c - TxBD Base Address of ring 7 */ | ||
527 | u8 res10[192]; | ||
528 | u32 rctrl; /* 0x.300 - Receive Control Register */ | ||
529 | u32 rstat; /* 0x.304 - Receive Status Register */ | ||
530 | u8 res12[8]; | ||
531 | u32 rxic; /* 0x.310 - Receive Interrupt Coalescing Configuration Register */ | ||
532 | u32 rqueue; /* 0x.314 - Receive queue control register */ | ||
533 | u8 res13[24]; | ||
534 | u32 rbifx; /* 0x.330 - Receive bit field extract control register */ | ||
535 | u32 rqfar; /* 0x.334 - Receive queue filing table address register */ | ||
536 | u32 rqfcr; /* 0x.338 - Receive queue filing table control register */ | ||
537 | u32 rqfpr; /* 0x.33c - Receive queue filing table property register */ | ||
538 | u32 mrblr; /* 0x.340 - Maximum Receive Buffer Length Register */ | ||
539 | u8 res14[56]; | ||
540 | u32 rbdbph; /* 0x.37c - Rx data buffer pointer high */ | ||
541 | u8 res15a[4]; | ||
542 | u32 rbptr0; /* 0x.384 - RxBD pointer for ring 0 */ | ||
543 | u8 res15b[4]; | ||
544 | u32 rbptr1; /* 0x.38c - RxBD pointer for ring 1 */ | ||
545 | u8 res15c[4]; | ||
546 | u32 rbptr2; /* 0x.394 - RxBD pointer for ring 2 */ | ||
547 | u8 res15d[4]; | ||
548 | u32 rbptr3; /* 0x.39c - RxBD pointer for ring 3 */ | ||
549 | u8 res15e[4]; | ||
550 | u32 rbptr4; /* 0x.3a4 - RxBD pointer for ring 4 */ | ||
551 | u8 res15f[4]; | ||
552 | u32 rbptr5; /* 0x.3ac - RxBD pointer for ring 5 */ | ||
553 | u8 res15g[4]; | ||
554 | u32 rbptr6; /* 0x.3b4 - RxBD pointer for ring 6 */ | ||
555 | u8 res15h[4]; | ||
556 | u32 rbptr7; /* 0x.3bc - RxBD pointer for ring 7 */ | ||
557 | u8 res16[64]; | ||
558 | u32 rbaseh; /* 0x.400 - RxBD base address high */ | ||
559 | u32 rbase0; /* 0x.404 - RxBD base address of ring 0 */ | ||
560 | u8 res17a[4]; | ||
561 | u32 rbase1; /* 0x.40c - RxBD base address of ring 1 */ | ||
562 | u8 res17b[4]; | ||
563 | u32 rbase2; /* 0x.414 - RxBD base address of ring 2 */ | ||
564 | u8 res17c[4]; | ||
565 | u32 rbase3; /* 0x.41c - RxBD base address of ring 3 */ | ||
566 | u8 res17d[4]; | ||
567 | u32 rbase4; /* 0x.424 - RxBD base address of ring 4 */ | ||
568 | u8 res17e[4]; | ||
569 | u32 rbase5; /* 0x.42c - RxBD base address of ring 5 */ | ||
570 | u8 res17f[4]; | ||
571 | u32 rbase6; /* 0x.434 - RxBD base address of ring 6 */ | ||
572 | u8 res17g[4]; | ||
573 | u32 rbase7; /* 0x.43c - RxBD base address of ring 7 */ | ||
574 | u8 res17[192]; | ||
575 | u32 maccfg1; /* 0x.500 - MAC Configuration 1 Register */ | ||
576 | u32 maccfg2; /* 0x.504 - MAC Configuration 2 Register */ | ||
577 | u32 ipgifg; /* 0x.508 - Inter Packet Gap/Inter Frame Gap Register */ | ||
578 | u32 hafdup; /* 0x.50c - Half Duplex Register */ | ||
579 | u32 maxfrm; /* 0x.510 - Maximum Frame Length Register */ | ||
424 | u8 res18[12]; | 580 | u8 res18[12]; |
425 | u32 miimcfg; /* 0x.520 - MII Management Configuration Register */ | 581 | u32 miimcfg; /* 0x.520 - MII Management Configuration Register */ |
426 | u32 miimcom; /* 0x.524 - MII Management Command Register */ | 582 | u32 miimcom; /* 0x.524 - MII Management Command Register */ |
427 | u32 miimadd; /* 0x.528 - MII Management Address Register */ | 583 | u32 miimadd; /* 0x.528 - MII Management Address Register */ |
428 | u32 miimcon; /* 0x.52c - MII Management Control Register */ | 584 | u32 miimcon; /* 0x.52c - MII Management Control Register */ |
429 | u32 miimstat; /* 0x.530 - MII Management Status Register */ | 585 | u32 miimstat; /* 0x.530 - MII Management Status Register */ |
430 | u32 miimind; /* 0x.534 - MII Management Indicator Register */ | 586 | u32 miimind; /* 0x.534 - MII Management Indicator Register */ |
431 | u8 res19[4]; | 587 | u8 res19[4]; |
432 | u32 ifstat; /* 0x.53c - Interface Status Register */ | 588 | u32 ifstat; /* 0x.53c - Interface Status Register */ |
433 | u32 macstnaddr1; /* 0x.540 - Station Address Part 1 Register */ | 589 | u32 macstnaddr1; /* 0x.540 - Station Address Part 1 Register */ |
434 | u32 macstnaddr2; /* 0x.544 - Station Address Part 2 Register */ | 590 | u32 macstnaddr2; /* 0x.544 - Station Address Part 2 Register */ |
435 | u8 res20[312]; | 591 | u32 mac01addr1; /* 0x.548 - MAC exact match address 1, part 1 */ |
436 | struct rmon_mib rmon; | 592 | u32 mac01addr2; /* 0x.54c - MAC exact match address 1, part 2 */ |
437 | u8 res21[192]; | 593 | u32 mac02addr1; /* 0x.550 - MAC exact match address 2, part 1 */ |
438 | u32 iaddr0; /* 0x.800 - Indivdual address register 0 */ | 594 | u32 mac02addr2; /* 0x.554 - MAC exact match address 2, part 2 */ |
439 | u32 iaddr1; /* 0x.804 - Indivdual address register 1 */ | 595 | u32 mac03addr1; /* 0x.558 - MAC exact match address 3, part 1 */ |
440 | u32 iaddr2; /* 0x.808 - Indivdual address register 2 */ | 596 | u32 mac03addr2; /* 0x.55c - MAC exact match address 3, part 2 */ |
441 | u32 iaddr3; /* 0x.80c - Indivdual address register 3 */ | 597 | u32 mac04addr1; /* 0x.560 - MAC exact match address 4, part 1 */ |
442 | u32 iaddr4; /* 0x.810 - Indivdual address register 4 */ | 598 | u32 mac04addr2; /* 0x.564 - MAC exact match address 4, part 2 */ |
443 | u32 iaddr5; /* 0x.814 - Indivdual address register 5 */ | 599 | u32 mac05addr1; /* 0x.568 - MAC exact match address 5, part 1 */ |
444 | u32 iaddr6; /* 0x.818 - Indivdual address register 6 */ | 600 | u32 mac05addr2; /* 0x.56c - MAC exact match address 5, part 2 */ |
445 | u32 iaddr7; /* 0x.81c - Indivdual address register 7 */ | 601 | u32 mac06addr1; /* 0x.570 - MAC exact match address 6, part 1 */ |
602 | u32 mac06addr2; /* 0x.574 - MAC exact match address 6, part 2 */ | ||
603 | u32 mac07addr1; /* 0x.578 - MAC exact match address 7, part 1 */ | ||
604 | u32 mac07addr2; /* 0x.57c - MAC exact match address 7, part 2 */ | ||
605 | u32 mac08addr1; /* 0x.580 - MAC exact match address 8, part 1 */ | ||
606 | u32 mac08addr2; /* 0x.584 - MAC exact match address 8, part 2 */ | ||
607 | u32 mac09addr1; /* 0x.588 - MAC exact match address 9, part 1 */ | ||
608 | u32 mac09addr2; /* 0x.58c - MAC exact match address 9, part 2 */ | ||
609 | u32 mac10addr1; /* 0x.590 - MAC exact match address 10, part 1*/ | ||
610 | u32 mac10addr2; /* 0x.594 - MAC exact match address 10, part 2*/ | ||
611 | u32 mac11addr1; /* 0x.598 - MAC exact match address 11, part 1*/ | ||
612 | u32 mac11addr2; /* 0x.59c - MAC exact match address 11, part 2*/ | ||
613 | u32 mac12addr1; /* 0x.5a0 - MAC exact match address 12, part 1*/ | ||
614 | u32 mac12addr2; /* 0x.5a4 - MAC exact match address 12, part 2*/ | ||
615 | u32 mac13addr1; /* 0x.5a8 - MAC exact match address 13, part 1*/ | ||
616 | u32 mac13addr2; /* 0x.5ac - MAC exact match address 13, part 2*/ | ||
617 | u32 mac14addr1; /* 0x.5b0 - MAC exact match address 14, part 1*/ | ||
618 | u32 mac14addr2; /* 0x.5b4 - MAC exact match address 14, part 2*/ | ||
619 | u32 mac15addr1; /* 0x.5b8 - MAC exact match address 15, part 1*/ | ||
620 | u32 mac15addr2; /* 0x.5bc - MAC exact match address 15, part 2*/ | ||
621 | u8 res20[192]; | ||
622 | struct rmon_mib rmon; /* 0x.680-0x.73c */ | ||
623 | u32 rrej; /* 0x.740 - Receive filer rejected packet counter */ | ||
624 | u8 res21[188]; | ||
625 | u32 igaddr0; /* 0x.800 - Indivdual/Group address register 0*/ | ||
626 | u32 igaddr1; /* 0x.804 - Indivdual/Group address register 1*/ | ||
627 | u32 igaddr2; /* 0x.808 - Indivdual/Group address register 2*/ | ||
628 | u32 igaddr3; /* 0x.80c - Indivdual/Group address register 3*/ | ||
629 | u32 igaddr4; /* 0x.810 - Indivdual/Group address register 4*/ | ||
630 | u32 igaddr5; /* 0x.814 - Indivdual/Group address register 5*/ | ||
631 | u32 igaddr6; /* 0x.818 - Indivdual/Group address register 6*/ | ||
632 | u32 igaddr7; /* 0x.81c - Indivdual/Group address register 7*/ | ||
446 | u8 res22[96]; | 633 | u8 res22[96]; |
447 | u32 gaddr0; /* 0x.880 - Global address register 0 */ | 634 | u32 gaddr0; /* 0x.880 - Group address register 0 */ |
448 | u32 gaddr1; /* 0x.884 - Global address register 1 */ | 635 | u32 gaddr1; /* 0x.884 - Group address register 1 */ |
449 | u32 gaddr2; /* 0x.888 - Global address register 2 */ | 636 | u32 gaddr2; /* 0x.888 - Group address register 2 */ |
450 | u32 gaddr3; /* 0x.88c - Global address register 3 */ | 637 | u32 gaddr3; /* 0x.88c - Group address register 3 */ |
451 | u32 gaddr4; /* 0x.890 - Global address register 4 */ | 638 | u32 gaddr4; /* 0x.890 - Group address register 4 */ |
452 | u32 gaddr5; /* 0x.894 - Global address register 5 */ | 639 | u32 gaddr5; /* 0x.894 - Group address register 5 */ |
453 | u32 gaddr6; /* 0x.898 - Global address register 6 */ | 640 | u32 gaddr6; /* 0x.898 - Group address register 6 */ |
454 | u32 gaddr7; /* 0x.89c - Global address register 7 */ | 641 | u32 gaddr7; /* 0x.89c - Group address register 7 */ |
455 | u8 res23[856]; | 642 | u8 res23a[352]; |
456 | u32 attr; /* 0x.bf8 - Attributes Register */ | 643 | u32 fifocfg; /* 0x.a00 - FIFO interface config register */ |
457 | u32 attreli; /* 0x.bfc - Attributes Extract Length and Extract Index Register */ | 644 | u8 res23b[252]; |
645 | u8 res23c[248]; | ||
646 | u32 attr; /* 0x.bf8 - Attributes Register */ | ||
647 | u32 attreli; /* 0x.bfc - Attributes Extract Length and Extract Index Register */ | ||
458 | u8 res24[1024]; | 648 | u8 res24[1024]; |
459 | 649 | ||
460 | }; | 650 | }; |
@@ -496,6 +686,8 @@ struct gfar_private { | |||
496 | struct txbd8 *cur_tx; /* Next free ring entry */ | 686 | struct txbd8 *cur_tx; /* Next free ring entry */ |
497 | struct txbd8 *dirty_tx; /* The Ring entry to be freed. */ | 687 | struct txbd8 *dirty_tx; /* The Ring entry to be freed. */ |
498 | struct gfar *regs; /* Pointer to the GFAR memory mapped Registers */ | 688 | struct gfar *regs; /* Pointer to the GFAR memory mapped Registers */ |
689 | u32 *hash_regs[16]; | ||
690 | int hash_width; | ||
499 | struct gfar *phyregs; | 691 | struct gfar *phyregs; |
500 | struct work_struct tq; | 692 | struct work_struct tq; |
501 | struct timer_list phy_info_timer; | 693 | struct timer_list phy_info_timer; |
@@ -506,9 +698,12 @@ struct gfar_private { | |||
506 | unsigned int rx_stash_size; | 698 | unsigned int rx_stash_size; |
507 | unsigned int tx_ring_size; | 699 | unsigned int tx_ring_size; |
508 | unsigned int rx_ring_size; | 700 | unsigned int rx_ring_size; |
509 | wait_queue_head_t rxcleanupq; | ||
510 | unsigned int rxclean; | ||
511 | 701 | ||
702 | unsigned char vlan_enable:1, | ||
703 | rx_csum_enable:1, | ||
704 | extended_hash:1; | ||
705 | unsigned short padding; | ||
706 | struct vlan_group *vlgrp; | ||
512 | /* Info structure initialized by board setup code */ | 707 | /* Info structure initialized by board setup code */ |
513 | unsigned int interruptTransmit; | 708 | unsigned int interruptTransmit; |
514 | unsigned int interruptReceive; | 709 | unsigned int interruptReceive; |
@@ -519,6 +714,8 @@ struct gfar_private { | |||
519 | int oldspeed; | 714 | int oldspeed; |
520 | int oldduplex; | 715 | int oldduplex; |
521 | int oldlink; | 716 | int oldlink; |
717 | |||
718 | uint32_t msg_enable; | ||
522 | }; | 719 | }; |
523 | 720 | ||
524 | extern inline u32 gfar_read(volatile unsigned *addr) | 721 | extern inline u32 gfar_read(volatile unsigned *addr) |
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c index 28046e9e88ba..a451de629197 100644 --- a/drivers/net/gianfar_ethtool.c +++ b/drivers/net/gianfar_ethtool.c | |||
@@ -46,16 +46,18 @@ | |||
46 | 46 | ||
47 | extern int startup_gfar(struct net_device *dev); | 47 | extern int startup_gfar(struct net_device *dev); |
48 | extern void stop_gfar(struct net_device *dev); | 48 | extern void stop_gfar(struct net_device *dev); |
49 | extern void gfar_receive(int irq, void *dev_id, struct pt_regs *regs); | 49 | extern void gfar_halt(struct net_device *dev); |
50 | extern void gfar_start(struct net_device *dev); | ||
51 | extern int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit); | ||
50 | 52 | ||
51 | void gfar_fill_stats(struct net_device *dev, struct ethtool_stats *dummy, | 53 | static void gfar_fill_stats(struct net_device *dev, struct ethtool_stats *dummy, |
52 | u64 * buf); | 54 | u64 * buf); |
53 | void gfar_gstrings(struct net_device *dev, u32 stringset, u8 * buf); | 55 | static void gfar_gstrings(struct net_device *dev, u32 stringset, u8 * buf); |
54 | int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals); | 56 | static int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals); |
55 | int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals); | 57 | static int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals); |
56 | void gfar_gringparam(struct net_device *dev, struct ethtool_ringparam *rvals); | 58 | static void gfar_gringparam(struct net_device *dev, struct ethtool_ringparam *rvals); |
57 | int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rvals); | 59 | static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rvals); |
58 | void gfar_gdrvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo); | 60 | static void gfar_gdrvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo); |
59 | 61 | ||
60 | static char stat_gstrings[][ETH_GSTRING_LEN] = { | 62 | static char stat_gstrings[][ETH_GSTRING_LEN] = { |
61 | "rx-dropped-by-kernel", | 63 | "rx-dropped-by-kernel", |
@@ -118,57 +120,56 @@ static char stat_gstrings[][ETH_GSTRING_LEN] = { | |||
118 | "tx-fragmented-frames", | 120 | "tx-fragmented-frames", |
119 | }; | 121 | }; |
120 | 122 | ||
123 | /* Fill in a buffer with the strings which correspond to the | ||
124 | * stats */ | ||
125 | static void gfar_gstrings(struct net_device *dev, u32 stringset, u8 * buf) | ||
126 | { | ||
127 | struct gfar_private *priv = netdev_priv(dev); | ||
128 | |||
129 | if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_RMON) | ||
130 | memcpy(buf, stat_gstrings, GFAR_STATS_LEN * ETH_GSTRING_LEN); | ||
131 | else | ||
132 | memcpy(buf, stat_gstrings, | ||
133 | GFAR_EXTRA_STATS_LEN * ETH_GSTRING_LEN); | ||
134 | } | ||
135 | |||
121 | /* Fill in an array of 64-bit statistics from various sources. | 136 | /* Fill in an array of 64-bit statistics from various sources. |
122 | * This array will be appended to the end of the ethtool_stats | 137 | * This array will be appended to the end of the ethtool_stats |
123 | * structure, and returned to user space | 138 | * structure, and returned to user space |
124 | */ | 139 | */ |
125 | void gfar_fill_stats(struct net_device *dev, struct ethtool_stats *dummy, u64 * buf) | 140 | static void gfar_fill_stats(struct net_device *dev, struct ethtool_stats *dummy, u64 * buf) |
126 | { | 141 | { |
127 | int i; | 142 | int i; |
128 | struct gfar_private *priv = netdev_priv(dev); | 143 | struct gfar_private *priv = netdev_priv(dev); |
129 | u32 *rmon = (u32 *) & priv->regs->rmon; | ||
130 | u64 *extra = (u64 *) & priv->extra_stats; | 144 | u64 *extra = (u64 *) & priv->extra_stats; |
131 | struct gfar_stats *stats = (struct gfar_stats *) buf; | ||
132 | 145 | ||
133 | for (i = 0; i < GFAR_RMON_LEN; i++) { | 146 | if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_RMON) { |
134 | stats->rmon[i] = (u64) (rmon[i]); | 147 | u32 *rmon = (u32 *) & priv->regs->rmon; |
135 | } | 148 | struct gfar_stats *stats = (struct gfar_stats *) buf; |
136 | |||
137 | for (i = 0; i < GFAR_EXTRA_STATS_LEN; i++) { | ||
138 | stats->extra[i] = extra[i]; | ||
139 | } | ||
140 | } | ||
141 | 149 | ||
142 | /* Returns the number of stats (and their corresponding strings) */ | 150 | for (i = 0; i < GFAR_RMON_LEN; i++) |
143 | int gfar_stats_count(struct net_device *dev) | 151 | stats->rmon[i] = (u64) (rmon[i]); |
144 | { | ||
145 | return GFAR_STATS_LEN; | ||
146 | } | ||
147 | 152 | ||
148 | void gfar_gstrings_normon(struct net_device *dev, u32 stringset, u8 * buf) | 153 | for (i = 0; i < GFAR_EXTRA_STATS_LEN; i++) |
149 | { | 154 | stats->extra[i] = extra[i]; |
150 | memcpy(buf, stat_gstrings, GFAR_EXTRA_STATS_LEN * ETH_GSTRING_LEN); | 155 | } else |
156 | for (i = 0; i < GFAR_EXTRA_STATS_LEN; i++) | ||
157 | buf[i] = extra[i]; | ||
151 | } | 158 | } |
152 | 159 | ||
153 | void gfar_fill_stats_normon(struct net_device *dev, | 160 | /* Returns the number of stats (and their corresponding strings) */ |
154 | struct ethtool_stats *dummy, u64 * buf) | 161 | static int gfar_stats_count(struct net_device *dev) |
155 | { | 162 | { |
156 | int i; | ||
157 | struct gfar_private *priv = netdev_priv(dev); | 163 | struct gfar_private *priv = netdev_priv(dev); |
158 | u64 *extra = (u64 *) & priv->extra_stats; | ||
159 | 164 | ||
160 | for (i = 0; i < GFAR_EXTRA_STATS_LEN; i++) { | 165 | if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_RMON) |
161 | buf[i] = extra[i]; | 166 | return GFAR_STATS_LEN; |
162 | } | 167 | else |
168 | return GFAR_EXTRA_STATS_LEN; | ||
163 | } | 169 | } |
164 | 170 | ||
165 | |||
166 | int gfar_stats_count_normon(struct net_device *dev) | ||
167 | { | ||
168 | return GFAR_EXTRA_STATS_LEN; | ||
169 | } | ||
170 | /* Fills in the drvinfo structure with some basic info */ | 171 | /* Fills in the drvinfo structure with some basic info */ |
171 | void gfar_gdrvinfo(struct net_device *dev, struct | 172 | static void gfar_gdrvinfo(struct net_device *dev, struct |
172 | ethtool_drvinfo *drvinfo) | 173 | ethtool_drvinfo *drvinfo) |
173 | { | 174 | { |
174 | strncpy(drvinfo->driver, DRV_NAME, GFAR_INFOSTR_LEN); | 175 | strncpy(drvinfo->driver, DRV_NAME, GFAR_INFOSTR_LEN); |
@@ -182,7 +183,7 @@ void gfar_gdrvinfo(struct net_device *dev, struct | |||
182 | } | 183 | } |
183 | 184 | ||
184 | /* Return the current settings in the ethtool_cmd structure */ | 185 | /* Return the current settings in the ethtool_cmd structure */ |
185 | int gfar_gsettings(struct net_device *dev, struct ethtool_cmd *cmd) | 186 | static int gfar_gsettings(struct net_device *dev, struct ethtool_cmd *cmd) |
186 | { | 187 | { |
187 | struct gfar_private *priv = netdev_priv(dev); | 188 | struct gfar_private *priv = netdev_priv(dev); |
188 | uint gigabit_support = | 189 | uint gigabit_support = |
@@ -216,13 +217,13 @@ int gfar_gsettings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
216 | } | 217 | } |
217 | 218 | ||
218 | /* Return the length of the register structure */ | 219 | /* Return the length of the register structure */ |
219 | int gfar_reglen(struct net_device *dev) | 220 | static int gfar_reglen(struct net_device *dev) |
220 | { | 221 | { |
221 | return sizeof (struct gfar); | 222 | return sizeof (struct gfar); |
222 | } | 223 | } |
223 | 224 | ||
224 | /* Return a dump of the GFAR register space */ | 225 | /* Return a dump of the GFAR register space */ |
225 | void gfar_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *regbuf) | 226 | static void gfar_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *regbuf) |
226 | { | 227 | { |
227 | int i; | 228 | int i; |
228 | struct gfar_private *priv = netdev_priv(dev); | 229 | struct gfar_private *priv = netdev_priv(dev); |
@@ -233,13 +234,6 @@ void gfar_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *regb | |||
233 | buf[i] = theregs[i]; | 234 | buf[i] = theregs[i]; |
234 | } | 235 | } |
235 | 236 | ||
236 | /* Fill in a buffer with the strings which correspond to the | ||
237 | * stats */ | ||
238 | void gfar_gstrings(struct net_device *dev, u32 stringset, u8 * buf) | ||
239 | { | ||
240 | memcpy(buf, stat_gstrings, GFAR_STATS_LEN * ETH_GSTRING_LEN); | ||
241 | } | ||
242 | |||
243 | /* Convert microseconds to ethernet clock ticks, which changes | 237 | /* Convert microseconds to ethernet clock ticks, which changes |
244 | * depending on what speed the controller is running at */ | 238 | * depending on what speed the controller is running at */ |
245 | static unsigned int gfar_usecs2ticks(struct gfar_private *priv, unsigned int usecs) | 239 | static unsigned int gfar_usecs2ticks(struct gfar_private *priv, unsigned int usecs) |
@@ -291,9 +285,12 @@ static unsigned int gfar_ticks2usecs(struct gfar_private *priv, unsigned int tic | |||
291 | 285 | ||
292 | /* Get the coalescing parameters, and put them in the cvals | 286 | /* Get the coalescing parameters, and put them in the cvals |
293 | * structure. */ | 287 | * structure. */ |
294 | int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals) | 288 | static int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals) |
295 | { | 289 | { |
296 | struct gfar_private *priv = netdev_priv(dev); | 290 | struct gfar_private *priv = netdev_priv(dev); |
291 | |||
292 | if (!(priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_COALESCE)) | ||
293 | return -EOPNOTSUPP; | ||
297 | 294 | ||
298 | cvals->rx_coalesce_usecs = gfar_ticks2usecs(priv, priv->rxtime); | 295 | cvals->rx_coalesce_usecs = gfar_ticks2usecs(priv, priv->rxtime); |
299 | cvals->rx_max_coalesced_frames = priv->rxcount; | 296 | cvals->rx_max_coalesced_frames = priv->rxcount; |
@@ -337,10 +334,13 @@ int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals) | |||
337 | * Both cvals->*_usecs and cvals->*_frames have to be > 0 | 334 | * Both cvals->*_usecs and cvals->*_frames have to be > 0 |
338 | * in order for coalescing to be active | 335 | * in order for coalescing to be active |
339 | */ | 336 | */ |
340 | int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals) | 337 | static int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals) |
341 | { | 338 | { |
342 | struct gfar_private *priv = netdev_priv(dev); | 339 | struct gfar_private *priv = netdev_priv(dev); |
343 | 340 | ||
341 | if (!(priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_COALESCE)) | ||
342 | return -EOPNOTSUPP; | ||
343 | |||
344 | /* Set up rx coalescing */ | 344 | /* Set up rx coalescing */ |
345 | if ((cvals->rx_coalesce_usecs == 0) || | 345 | if ((cvals->rx_coalesce_usecs == 0) || |
346 | (cvals->rx_max_coalesced_frames == 0)) | 346 | (cvals->rx_max_coalesced_frames == 0)) |
@@ -379,7 +379,7 @@ int gfar_scoalesce(struct net_device *dev, struct ethtool_coalesce *cvals) | |||
379 | /* Fills in rvals with the current ring parameters. Currently, | 379 | /* Fills in rvals with the current ring parameters. Currently, |
380 | * rx, rx_mini, and rx_jumbo rings are the same size, as mini and | 380 | * rx, rx_mini, and rx_jumbo rings are the same size, as mini and |
381 | * jumbo are ignored by the driver */ | 381 | * jumbo are ignored by the driver */ |
382 | void gfar_gringparam(struct net_device *dev, struct ethtool_ringparam *rvals) | 382 | static void gfar_gringparam(struct net_device *dev, struct ethtool_ringparam *rvals) |
383 | { | 383 | { |
384 | struct gfar_private *priv = netdev_priv(dev); | 384 | struct gfar_private *priv = netdev_priv(dev); |
385 | 385 | ||
@@ -401,9 +401,8 @@ void gfar_gringparam(struct net_device *dev, struct ethtool_ringparam *rvals) | |||
401 | * necessary so that we don't mess things up while we're in | 401 | * necessary so that we don't mess things up while we're in |
402 | * motion. We wait for the ring to be clean before reallocating | 402 | * motion. We wait for the ring to be clean before reallocating |
403 | * the rings. */ | 403 | * the rings. */ |
404 | int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rvals) | 404 | static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rvals) |
405 | { | 405 | { |
406 | u32 tempval; | ||
407 | struct gfar_private *priv = netdev_priv(dev); | 406 | struct gfar_private *priv = netdev_priv(dev); |
408 | int err = 0; | 407 | int err = 0; |
409 | 408 | ||
@@ -425,37 +424,54 @@ int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rvals) | |||
425 | return -EINVAL; | 424 | return -EINVAL; |
426 | } | 425 | } |
427 | 426 | ||
428 | /* Stop the controller so we don't rx any more frames */ | 427 | if (dev->flags & IFF_UP) { |
429 | /* But first, make sure we clear the bits */ | 428 | unsigned long flags; |
430 | tempval = gfar_read(&priv->regs->dmactrl); | ||
431 | tempval &= ~(DMACTRL_GRS | DMACTRL_GTS); | ||
432 | gfar_write(&priv->regs->dmactrl, tempval); | ||
433 | 429 | ||
434 | tempval = gfar_read(&priv->regs->dmactrl); | 430 | /* Halt TX and RX, and process the frames which |
435 | tempval |= (DMACTRL_GRS | DMACTRL_GTS); | 431 | * have already been received */ |
436 | gfar_write(&priv->regs->dmactrl, tempval); | 432 | spin_lock_irqsave(&priv->lock, flags); |
433 | gfar_halt(dev); | ||
434 | gfar_clean_rx_ring(dev, priv->rx_ring_size); | ||
435 | spin_unlock_irqrestore(&priv->lock, flags); | ||
437 | 436 | ||
438 | while (!(gfar_read(&priv->regs->ievent) & (IEVENT_GRSC | IEVENT_GTSC))) | 437 | /* Now we take down the rings to rebuild them */ |
439 | cpu_relax(); | 438 | stop_gfar(dev); |
439 | } | ||
440 | 440 | ||
441 | /* Note that rx is not clean right now */ | 441 | /* Change the size */ |
442 | priv->rxclean = 0; | 442 | priv->rx_ring_size = rvals->rx_pending; |
443 | priv->tx_ring_size = rvals->tx_pending; | ||
443 | 444 | ||
444 | if (dev->flags & IFF_UP) { | 445 | /* Rebuild the rings with the new size */ |
445 | /* Tell the driver to process the rest of the frames */ | 446 | if (dev->flags & IFF_UP) |
446 | gfar_receive(0, (void *) dev, NULL); | 447 | err = startup_gfar(dev); |
447 | 448 | ||
448 | /* Now wait for it to be done */ | 449 | return err; |
449 | wait_event_interruptible(priv->rxcleanupq, priv->rxclean); | 450 | } |
450 | 451 | ||
451 | /* Ok, all packets have been handled. Now we bring it down, | 452 | static int gfar_set_rx_csum(struct net_device *dev, uint32_t data) |
452 | * change the ring size, and bring it up */ | 453 | { |
454 | struct gfar_private *priv = netdev_priv(dev); | ||
455 | int err = 0; | ||
453 | 456 | ||
457 | if (!(priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_CSUM)) | ||
458 | return -EOPNOTSUPP; | ||
459 | |||
460 | if (dev->flags & IFF_UP) { | ||
461 | unsigned long flags; | ||
462 | |||
463 | /* Halt TX and RX, and process the frames which | ||
464 | * have already been received */ | ||
465 | spin_lock_irqsave(&priv->lock, flags); | ||
466 | gfar_halt(dev); | ||
467 | gfar_clean_rx_ring(dev, priv->rx_ring_size); | ||
468 | spin_unlock_irqrestore(&priv->lock, flags); | ||
469 | |||
470 | /* Now we take down the rings to rebuild them */ | ||
454 | stop_gfar(dev); | 471 | stop_gfar(dev); |
455 | } | 472 | } |
456 | 473 | ||
457 | priv->rx_ring_size = rvals->rx_pending; | 474 | priv->rx_csum_enable = data; |
458 | priv->tx_ring_size = rvals->tx_pending; | ||
459 | 475 | ||
460 | if (dev->flags & IFF_UP) | 476 | if (dev->flags & IFF_UP) |
461 | err = startup_gfar(dev); | 477 | err = startup_gfar(dev); |
@@ -463,6 +479,61 @@ int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rvals) | |||
463 | return err; | 479 | return err; |
464 | } | 480 | } |
465 | 481 | ||
482 | static uint32_t gfar_get_rx_csum(struct net_device *dev) | ||
483 | { | ||
484 | struct gfar_private *priv = netdev_priv(dev); | ||
485 | |||
486 | if (!(priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_CSUM)) | ||
487 | return 0; | ||
488 | |||
489 | return priv->rx_csum_enable; | ||
490 | } | ||
491 | |||
492 | static int gfar_set_tx_csum(struct net_device *dev, uint32_t data) | ||
493 | { | ||
494 | unsigned long flags; | ||
495 | struct gfar_private *priv = netdev_priv(dev); | ||
496 | |||
497 | if (!(priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_CSUM)) | ||
498 | return -EOPNOTSUPP; | ||
499 | |||
500 | spin_lock_irqsave(&priv->lock, flags); | ||
501 | gfar_halt(dev); | ||
502 | |||
503 | if (data) | ||
504 | dev->features |= NETIF_F_IP_CSUM; | ||
505 | else | ||
506 | dev->features &= ~NETIF_F_IP_CSUM; | ||
507 | |||
508 | gfar_start(dev); | ||
509 | spin_unlock_irqrestore(&priv->lock, flags); | ||
510 | |||
511 | return 0; | ||
512 | } | ||
513 | |||
514 | static uint32_t gfar_get_tx_csum(struct net_device *dev) | ||
515 | { | ||
516 | struct gfar_private *priv = netdev_priv(dev); | ||
517 | |||
518 | if (!(priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_CSUM)) | ||
519 | return 0; | ||
520 | |||
521 | return (dev->features & NETIF_F_IP_CSUM) != 0; | ||
522 | } | ||
523 | |||
524 | static uint32_t gfar_get_msglevel(struct net_device *dev) | ||
525 | { | ||
526 | struct gfar_private *priv = netdev_priv(dev); | ||
527 | return priv->msg_enable; | ||
528 | } | ||
529 | |||
530 | static void gfar_set_msglevel(struct net_device *dev, uint32_t data) | ||
531 | { | ||
532 | struct gfar_private *priv = netdev_priv(dev); | ||
533 | priv->msg_enable = data; | ||
534 | } | ||
535 | |||
536 | |||
466 | struct ethtool_ops gfar_ethtool_ops = { | 537 | struct ethtool_ops gfar_ethtool_ops = { |
467 | .get_settings = gfar_gsettings, | 538 | .get_settings = gfar_gsettings, |
468 | .get_drvinfo = gfar_gdrvinfo, | 539 | .get_drvinfo = gfar_gdrvinfo, |
@@ -476,52 +547,10 @@ struct ethtool_ops gfar_ethtool_ops = { | |||
476 | .get_strings = gfar_gstrings, | 547 | .get_strings = gfar_gstrings, |
477 | .get_stats_count = gfar_stats_count, | 548 | .get_stats_count = gfar_stats_count, |
478 | .get_ethtool_stats = gfar_fill_stats, | 549 | .get_ethtool_stats = gfar_fill_stats, |
479 | }; | 550 | .get_rx_csum = gfar_get_rx_csum, |
480 | 551 | .get_tx_csum = gfar_get_tx_csum, | |
481 | struct ethtool_ops gfar_normon_nocoalesce_ethtool_ops = { | 552 | .set_rx_csum = gfar_set_rx_csum, |
482 | .get_settings = gfar_gsettings, | 553 | .set_tx_csum = gfar_set_tx_csum, |
483 | .get_drvinfo = gfar_gdrvinfo, | 554 | .get_msglevel = gfar_get_msglevel, |
484 | .get_regs_len = gfar_reglen, | 555 | .set_msglevel = gfar_set_msglevel, |
485 | .get_regs = gfar_get_regs, | ||
486 | .get_link = ethtool_op_get_link, | ||
487 | .get_ringparam = gfar_gringparam, | ||
488 | .set_ringparam = gfar_sringparam, | ||
489 | .get_strings = gfar_gstrings_normon, | ||
490 | .get_stats_count = gfar_stats_count_normon, | ||
491 | .get_ethtool_stats = gfar_fill_stats_normon, | ||
492 | }; | ||
493 | |||
494 | struct ethtool_ops gfar_nocoalesce_ethtool_ops = { | ||
495 | .get_settings = gfar_gsettings, | ||
496 | .get_drvinfo = gfar_gdrvinfo, | ||
497 | .get_regs_len = gfar_reglen, | ||
498 | .get_regs = gfar_get_regs, | ||
499 | .get_link = ethtool_op_get_link, | ||
500 | .get_ringparam = gfar_gringparam, | ||
501 | .set_ringparam = gfar_sringparam, | ||
502 | .get_strings = gfar_gstrings, | ||
503 | .get_stats_count = gfar_stats_count, | ||
504 | .get_ethtool_stats = gfar_fill_stats, | ||
505 | }; | ||
506 | |||
507 | struct ethtool_ops gfar_normon_ethtool_ops = { | ||
508 | .get_settings = gfar_gsettings, | ||
509 | .get_drvinfo = gfar_gdrvinfo, | ||
510 | .get_regs_len = gfar_reglen, | ||
511 | .get_regs = gfar_get_regs, | ||
512 | .get_link = ethtool_op_get_link, | ||
513 | .get_coalesce = gfar_gcoalesce, | ||
514 | .set_coalesce = gfar_scoalesce, | ||
515 | .get_ringparam = gfar_gringparam, | ||
516 | .set_ringparam = gfar_sringparam, | ||
517 | .get_strings = gfar_gstrings_normon, | ||
518 | .get_stats_count = gfar_stats_count_normon, | ||
519 | .get_ethtool_stats = gfar_fill_stats_normon, | ||
520 | }; | ||
521 | |||
522 | struct ethtool_ops *gfar_op_array[] = { | ||
523 | &gfar_ethtool_ops, | ||
524 | &gfar_normon_ethtool_ops, | ||
525 | &gfar_nocoalesce_ethtool_ops, | ||
526 | &gfar_normon_nocoalesce_ethtool_ops | ||
527 | }; | 556 | }; |
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index 13f114876965..3213f3e50487 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
@@ -850,7 +850,7 @@ static int pcnet32_phys_id(struct net_device *dev, u32 data) | |||
850 | if ((!data) || (data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))) | 850 | if ((!data) || (data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))) |
851 | data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ); | 851 | data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ); |
852 | 852 | ||
853 | schedule_timeout(data * HZ); | 853 | msleep_interruptible(data * 1000); |
854 | del_timer_sync(&lp->blink_timer); | 854 | del_timer_sync(&lp->blink_timer); |
855 | 855 | ||
856 | /* Restore the original value of the bcrs */ | 856 | /* Restore the original value of the bcrs */ |
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index e15369c8d165..d6388e1533f0 100644 --- a/drivers/net/sb1000.c +++ b/drivers/net/sb1000.c | |||
@@ -90,7 +90,6 @@ static int sb1000_close(struct net_device *dev); | |||
90 | 90 | ||
91 | 91 | ||
92 | /* SB1000 hardware routines to be used during open/configuration phases */ | 92 | /* SB1000 hardware routines to be used during open/configuration phases */ |
93 | static inline void nicedelay(unsigned long usecs); | ||
94 | static inline int card_wait_for_busy_clear(const int ioaddr[], | 93 | static inline int card_wait_for_busy_clear(const int ioaddr[], |
95 | const char* name); | 94 | const char* name); |
96 | static inline int card_wait_for_ready(const int ioaddr[], const char* name, | 95 | static inline int card_wait_for_ready(const int ioaddr[], const char* name, |
@@ -254,13 +253,6 @@ static struct pnp_driver sb1000_driver = { | |||
254 | 253 | ||
255 | static const int TimeOutJiffies = (875 * HZ) / 100; | 254 | static const int TimeOutJiffies = (875 * HZ) / 100; |
256 | 255 | ||
257 | static inline void nicedelay(unsigned long usecs) | ||
258 | { | ||
259 | current->state = TASK_INTERRUPTIBLE; | ||
260 | schedule_timeout(HZ); | ||
261 | return; | ||
262 | } | ||
263 | |||
264 | /* Card Wait For Busy Clear (cannot be used during an interrupt) */ | 256 | /* Card Wait For Busy Clear (cannot be used during an interrupt) */ |
265 | static inline int | 257 | static inline int |
266 | card_wait_for_busy_clear(const int ioaddr[], const char* name) | 258 | card_wait_for_busy_clear(const int ioaddr[], const char* name) |
@@ -475,7 +467,7 @@ sb1000_reset(const int ioaddr[], const char* name) | |||
475 | udelay(1000); | 467 | udelay(1000); |
476 | outb(0x0, port); | 468 | outb(0x0, port); |
477 | inb(port); | 469 | inb(port); |
478 | nicedelay(60000); | 470 | ssleep(1); |
479 | outb(0x4, port); | 471 | outb(0x4, port); |
480 | inb(port); | 472 | inb(port); |
481 | udelay(1000); | 473 | udelay(1000); |
@@ -537,7 +529,7 @@ sb1000_activate(const int ioaddr[], const char* name) | |||
537 | const unsigned char Command0[6] = {0x80, 0x11, 0x00, 0x00, 0x00, 0x00}; | 529 | const unsigned char Command0[6] = {0x80, 0x11, 0x00, 0x00, 0x00, 0x00}; |
538 | const unsigned char Command1[6] = {0x80, 0x16, 0x00, 0x00, 0x00, 0x00}; | 530 | const unsigned char Command1[6] = {0x80, 0x16, 0x00, 0x00, 0x00, 0x00}; |
539 | 531 | ||
540 | nicedelay(50000); | 532 | ssleep(1); |
541 | if ((status = card_send_command(ioaddr, name, Command0, st))) | 533 | if ((status = card_send_command(ioaddr, name, Command0, st))) |
542 | return status; | 534 | return status; |
543 | if ((status = card_send_command(ioaddr, name, Command1, st))) | 535 | if ((status = card_send_command(ioaddr, name, Command1, st))) |
@@ -944,7 +936,7 @@ sb1000_open(struct net_device *dev) | |||
944 | /* initialize sb1000 */ | 936 | /* initialize sb1000 */ |
945 | if ((status = sb1000_reset(ioaddr, name))) | 937 | if ((status = sb1000_reset(ioaddr, name))) |
946 | return status; | 938 | return status; |
947 | nicedelay(200000); | 939 | ssleep(1); |
948 | if ((status = sb1000_check_CRC(ioaddr, name))) | 940 | if ((status = sb1000_check_CRC(ioaddr, name))) |
949 | return status; | 941 | return status; |
950 | 942 | ||
diff --git a/drivers/net/skfp/Makefile b/drivers/net/skfp/Makefile index 5f4bb1a67400..cb23580fcffa 100644 --- a/drivers/net/skfp/Makefile +++ b/drivers/net/skfp/Makefile | |||
@@ -6,8 +6,8 @@ obj-$(CONFIG_SKFP) += skfp.o | |||
6 | 6 | ||
7 | skfp-objs := skfddi.o hwmtm.o fplustm.o smt.o cfm.o \ | 7 | skfp-objs := skfddi.o hwmtm.o fplustm.o smt.o cfm.o \ |
8 | ecm.o pcmplc.o pmf.o queue.o rmt.o \ | 8 | ecm.o pcmplc.o pmf.o queue.o rmt.o \ |
9 | smtdef.o smtinit.o smttimer.o srf.o smtparse.o\ | 9 | smtdef.o smtinit.o smttimer.o srf.o hwt.o \ |
10 | hwt.o drvfbi.o ess.o | 10 | drvfbi.o ess.o |
11 | 11 | ||
12 | # NOTE: | 12 | # NOTE: |
13 | # Compiling this driver produces some warnings (and some more are | 13 | # Compiling this driver produces some warnings (and some more are |
diff --git a/drivers/net/skfp/drvfbi.c b/drivers/net/skfp/drvfbi.c index 052e841ba187..5b475833f645 100644 --- a/drivers/net/skfp/drvfbi.c +++ b/drivers/net/skfp/drvfbi.c | |||
@@ -105,8 +105,8 @@ extern int AIX_vpdReadByte() ; | |||
105 | #endif | 105 | #endif |
106 | 106 | ||
107 | 107 | ||
108 | /* Prototypes of local functions. */ | 108 | /* Prototype of a local function. */ |
109 | void smt_stop_watchdog(struct s_smc *smc); | 109 | static void smt_stop_watchdog(struct s_smc *smc); |
110 | 110 | ||
111 | #ifdef MCA | 111 | #ifdef MCA |
112 | static int read_card_id() ; | 112 | static int read_card_id() ; |
@@ -631,7 +631,7 @@ void plc_clear_irq(struct s_smc *smc, int p) | |||
631 | * LED_Y_OFF just switch yellow LED off | 631 | * LED_Y_OFF just switch yellow LED off |
632 | * LED_Y_ON just switch yello LED on | 632 | * LED_Y_ON just switch yello LED on |
633 | */ | 633 | */ |
634 | void led_indication(struct s_smc *smc, int led_event) | 634 | static void led_indication(struct s_smc *smc, int led_event) |
635 | { | 635 | { |
636 | /* use smc->hw.mac_ring_is_up == TRUE | 636 | /* use smc->hw.mac_ring_is_up == TRUE |
637 | * as indication for Ring Operational | 637 | * as indication for Ring Operational |
@@ -764,122 +764,6 @@ void llc_recover_tx(struct s_smc *smc) | |||
764 | #endif | 764 | #endif |
765 | } | 765 | } |
766 | 766 | ||
767 | /*--------------------------- DMA init ----------------------------*/ | ||
768 | #ifdef ISA | ||
769 | |||
770 | /* | ||
771 | * init DMA | ||
772 | */ | ||
773 | void init_dma(struct s_smc *smc, int dma) | ||
774 | { | ||
775 | SK_UNUSED(smc) ; | ||
776 | |||
777 | /* | ||
778 | * set cascade mode, | ||
779 | * clear mask bit (enable DMA cannal) | ||
780 | */ | ||
781 | if (dma > 3) { | ||
782 | outp(0xd6,(dma & 0x03) | 0xc0) ; | ||
783 | outp(0xd4, dma & 0x03) ; | ||
784 | } | ||
785 | else { | ||
786 | outp(0x0b,(dma & 0x03) | 0xc0) ; | ||
787 | outp(0x0a,dma & 0x03) ; | ||
788 | } | ||
789 | } | ||
790 | |||
791 | /* | ||
792 | * disable DMA | ||
793 | */ | ||
794 | void dis_dma(struct s_smc *smc, int dma) | ||
795 | { | ||
796 | SK_UNUSED(smc) ; | ||
797 | |||
798 | /* | ||
799 | * set mask bit (disable DMA cannal) | ||
800 | */ | ||
801 | if (dma > 3) { | ||
802 | outp(0xd4,(dma & 0x03) | 0x04) ; | ||
803 | } | ||
804 | else { | ||
805 | outp(0x0a,(dma & 0x03) | 0x04) ; | ||
806 | } | ||
807 | } | ||
808 | |||
809 | #endif /* ISA */ | ||
810 | |||
811 | #ifdef EISA | ||
812 | |||
813 | /*arrays with io addresses of dma controller length and address registers*/ | ||
814 | static const int cntr[8] = { 0x001,0x003,0x005,0x007,0,0x0c6,0x0ca,0x0ce } ; | ||
815 | static const int base[8] = { 0x000,0x002,0x004,0x006,0,0x0c4,0x0c8,0x0cc } ; | ||
816 | static const int page[8] = { 0x087,0x083,0x081,0x082,0,0x08b,0x089,0x08a } ; | ||
817 | |||
818 | void init_dma(struct s_smc *smc, int dma) | ||
819 | { | ||
820 | /* | ||
821 | * extended mode register | ||
822 | * 32 bit IO | ||
823 | * type c | ||
824 | * TC output | ||
825 | * disable stop | ||
826 | */ | ||
827 | |||
828 | /* mode read (write) demand */ | ||
829 | smc->hw.dma_rmode = (dma & 3) | 0x08 | 0x0 ; | ||
830 | smc->hw.dma_wmode = (dma & 3) | 0x04 | 0x0 ; | ||
831 | |||
832 | /* 32 bit IO's, burst DMA mode (type "C") */ | ||
833 | smc->hw.dma_emode = (dma & 3) | 0x08 | 0x30 ; | ||
834 | |||
835 | outp((dma < 4) ? 0x40b : 0x4d6,smc->hw.dma_emode) ; | ||
836 | |||
837 | /* disable chaining */ | ||
838 | outp((dma < 4) ? 0x40a : 0x4d4,(dma&3)) ; | ||
839 | |||
840 | /*load dma controller addresses for fast access during set dma*/ | ||
841 | smc->hw.dma_base_word_count = cntr[smc->hw.dma]; | ||
842 | smc->hw.dma_base_address = base[smc->hw.dma]; | ||
843 | smc->hw.dma_base_address_page = page[smc->hw.dma]; | ||
844 | |||
845 | } | ||
846 | |||
847 | void dis_dma(struct s_smc *smc, int dma) | ||
848 | { | ||
849 | SK_UNUSED(smc) ; | ||
850 | |||
851 | outp((dma < 4) ? 0x0a : 0xd4,(dma&3)|4) ;/* mask bit */ | ||
852 | } | ||
853 | #endif /* EISA */ | ||
854 | |||
855 | #ifdef MCA | ||
856 | void init_dma(struct s_smc *smc, int dma) | ||
857 | { | ||
858 | SK_UNUSED(smc) ; | ||
859 | SK_UNUSED(dma) ; | ||
860 | } | ||
861 | |||
862 | void dis_dma(struct s_smc *smc, int dma) | ||
863 | { | ||
864 | SK_UNUSED(smc) ; | ||
865 | SK_UNUSED(dma) ; | ||
866 | } | ||
867 | #endif | ||
868 | |||
869 | #ifdef PCI | ||
870 | void init_dma(struct s_smc *smc, int dma) | ||
871 | { | ||
872 | SK_UNUSED(smc) ; | ||
873 | SK_UNUSED(dma) ; | ||
874 | } | ||
875 | |||
876 | void dis_dma(struct s_smc *smc, int dma) | ||
877 | { | ||
878 | SK_UNUSED(smc) ; | ||
879 | SK_UNUSED(dma) ; | ||
880 | } | ||
881 | #endif | ||
882 | |||
883 | #ifdef MULT_OEM | 767 | #ifdef MULT_OEM |
884 | static int is_equal_num(char comp1[], char comp2[], int num) | 768 | static int is_equal_num(char comp1[], char comp2[], int num) |
885 | { | 769 | { |
@@ -1407,7 +1291,7 @@ void smt_start_watchdog(struct s_smc *smc) | |||
1407 | #endif /* DEBUG */ | 1291 | #endif /* DEBUG */ |
1408 | } | 1292 | } |
1409 | 1293 | ||
1410 | void smt_stop_watchdog(struct s_smc *smc) | 1294 | static void smt_stop_watchdog(struct s_smc *smc) |
1411 | { | 1295 | { |
1412 | SK_UNUSED(smc) ; /* Make LINT happy. */ | 1296 | SK_UNUSED(smc) ; /* Make LINT happy. */ |
1413 | #ifndef DEBUG | 1297 | #ifndef DEBUG |
@@ -1422,104 +1306,6 @@ void smt_stop_watchdog(struct s_smc *smc) | |||
1422 | } | 1306 | } |
1423 | 1307 | ||
1424 | #ifdef PCI | 1308 | #ifdef PCI |
1425 | static char get_rom_byte(struct s_smc *smc, u_short addr) | ||
1426 | { | ||
1427 | GET_PAGE(addr) ; | ||
1428 | return (READ_PROM(ADDR(B2_FDP))) ; | ||
1429 | } | ||
1430 | |||
1431 | /* | ||
1432 | * ROM image defines | ||
1433 | */ | ||
1434 | #define ROM_SIG_1 0 | ||
1435 | #define ROM_SIG_2 1 | ||
1436 | #define PCI_DATA_1 0x18 | ||
1437 | #define PCI_DATA_2 0x19 | ||
1438 | |||
1439 | /* | ||
1440 | * PCI data structure defines | ||
1441 | */ | ||
1442 | #define VPD_DATA_1 0x08 | ||
1443 | #define VPD_DATA_2 0x09 | ||
1444 | #define IMAGE_LEN_1 0x10 | ||
1445 | #define IMAGE_LEN_2 0x11 | ||
1446 | #define CODE_TYPE 0x14 | ||
1447 | #define INDICATOR 0x15 | ||
1448 | |||
1449 | /* | ||
1450 | * BEGIN_MANUAL_ENTRY(mac_drv_vpd_read) | ||
1451 | * mac_drv_vpd_read(smc,buf,size,image) | ||
1452 | * | ||
1453 | * function DOWNCALL (FDDIWARE) | ||
1454 | * reads the VPD data of the FPROM and writes it into the | ||
1455 | * buffer | ||
1456 | * | ||
1457 | * para buf points to the buffer for the VPD data | ||
1458 | * size size of the VPD data buffer | ||
1459 | * image boot image; code type of the boot image | ||
1460 | * image = 0 Intel x86, PC-AT compatible | ||
1461 | * 1 OPENBOOT standard for PCI | ||
1462 | * 2-FF reserved | ||
1463 | * | ||
1464 | * returns len number of VPD data bytes read form the FPROM | ||
1465 | * <0 number of read bytes | ||
1466 | * >0 error: data invalid | ||
1467 | * | ||
1468 | * END_MANUAL_ENTRY | ||
1469 | */ | ||
1470 | int mac_drv_vpd_read(struct s_smc *smc, char *buf, int size, char image) | ||
1471 | { | ||
1472 | u_short ibase ; | ||
1473 | u_short pci_base ; | ||
1474 | u_short vpd ; | ||
1475 | int len ; | ||
1476 | |||
1477 | len = 0 ; | ||
1478 | ibase = 0 ; | ||
1479 | /* | ||
1480 | * as long images defined | ||
1481 | */ | ||
1482 | while (get_rom_byte(smc,ibase+ROM_SIG_1) == 0x55 && | ||
1483 | (u_char) get_rom_byte(smc,ibase+ROM_SIG_2) == 0xaa) { | ||
1484 | /* | ||
1485 | * get the pointer to the PCI data structure | ||
1486 | */ | ||
1487 | pci_base = ibase + get_rom_byte(smc,ibase+PCI_DATA_1) + | ||
1488 | (get_rom_byte(smc,ibase+PCI_DATA_2) << 8) ; | ||
1489 | |||
1490 | if (image == get_rom_byte(smc,pci_base+CODE_TYPE)) { | ||
1491 | /* | ||
1492 | * we have the right image, read the VPD data | ||
1493 | */ | ||
1494 | vpd = ibase + get_rom_byte(smc,pci_base+VPD_DATA_1) + | ||
1495 | (get_rom_byte(smc,pci_base+VPD_DATA_2) << 8) ; | ||
1496 | if (vpd == ibase) { | ||
1497 | break ; /* no VPD data */ | ||
1498 | } | ||
1499 | for (len = 0; len < size; len++,buf++,vpd++) { | ||
1500 | *buf = get_rom_byte(smc,vpd) ; | ||
1501 | } | ||
1502 | break ; | ||
1503 | } | ||
1504 | else { | ||
1505 | /* | ||
1506 | * try the next image | ||
1507 | */ | ||
1508 | if (get_rom_byte(smc,pci_base+INDICATOR) & 0x80) { | ||
1509 | break ; /* this was the last image */ | ||
1510 | } | ||
1511 | ibase = ibase + get_rom_byte(smc,ibase+IMAGE_LEN_1) + | ||
1512 | (get_rom_byte(smc,ibase+IMAGE_LEN_2) << 8) ; | ||
1513 | } | ||
1514 | } | ||
1515 | |||
1516 | return(len) ; | ||
1517 | } | ||
1518 | |||
1519 | void mac_drv_pci_fix(struct s_smc *smc, u_long fix_value) | ||
1520 | { | ||
1521 | smc->hw.pci_fix_value = fix_value ; | ||
1522 | } | ||
1523 | 1309 | ||
1524 | void mac_do_pci_fix(struct s_smc *smc) | 1310 | void mac_do_pci_fix(struct s_smc *smc) |
1525 | { | 1311 | { |
diff --git a/drivers/net/skfp/ess.c b/drivers/net/skfp/ess.c index fd39b4b2ef7d..62b01328c496 100644 --- a/drivers/net/skfp/ess.c +++ b/drivers/net/skfp/ess.c | |||
@@ -102,7 +102,7 @@ void ess_timer_poll(struct s_smc *smc); | |||
102 | void ess_para_change(struct s_smc *smc); | 102 | void ess_para_change(struct s_smc *smc); |
103 | int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm, | 103 | int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm, |
104 | int fs); | 104 | int fs); |
105 | int process_bw_alloc(struct s_smc *smc, long int payload, long int overhead); | 105 | static int process_bw_alloc(struct s_smc *smc, long int payload, long int overhead); |
106 | 106 | ||
107 | 107 | ||
108 | /* | 108 | /* |
@@ -375,7 +375,7 @@ int ess_raf_received_pack(struct s_smc *smc, SMbuf *mb, struct smt_header *sm, | |||
375 | * determines the synchronous bandwidth, set the TSYNC register and the | 375 | * determines the synchronous bandwidth, set the TSYNC register and the |
376 | * mib variables SBAPayload, SBAOverhead and fddiMACT-NEG. | 376 | * mib variables SBAPayload, SBAOverhead and fddiMACT-NEG. |
377 | */ | 377 | */ |
378 | int process_bw_alloc(struct s_smc *smc, long int payload, long int overhead) | 378 | static int process_bw_alloc(struct s_smc *smc, long int payload, long int overhead) |
379 | { | 379 | { |
380 | /* | 380 | /* |
381 | * determine the synchronous bandwidth (sync_bw) in bytes per T-NEG, | 381 | * determine the synchronous bandwidth (sync_bw) in bytes per T-NEG, |
diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/skfp/fplustm.c index 76e78442fc24..a2ed47f1cc70 100644 --- a/drivers/net/skfp/fplustm.c +++ b/drivers/net/skfp/fplustm.c | |||
@@ -1117,30 +1117,6 @@ void mac_clear_multicast(struct s_smc *smc) | |||
1117 | /* | 1117 | /* |
1118 | BEGIN_MANUAL_ENTRY(if,func;others;2) | 1118 | BEGIN_MANUAL_ENTRY(if,func;others;2) |
1119 | 1119 | ||
1120 | int mac_set_func_addr(smc,f_addr) | ||
1121 | struct s_smc *smc ; | ||
1122 | u_long f_addr ; | ||
1123 | |||
1124 | Function DOWNCALL (SMT, fplustm.c) | ||
1125 | Set a Token-Ring functional address, the address will | ||
1126 | be activated after calling mac_update_multicast() | ||
1127 | |||
1128 | Para f_addr functional bits in non-canonical format | ||
1129 | |||
1130 | Returns 0: always success | ||
1131 | |||
1132 | END_MANUAL_ENTRY() | ||
1133 | */ | ||
1134 | int mac_set_func_addr(struct s_smc *smc, u_long f_addr) | ||
1135 | { | ||
1136 | smc->hw.fp.func_addr = f_addr ; | ||
1137 | return(0) ; | ||
1138 | } | ||
1139 | |||
1140 | |||
1141 | /* | ||
1142 | BEGIN_MANUAL_ENTRY(if,func;others;2) | ||
1143 | |||
1144 | int mac_add_multicast(smc,addr,can) | 1120 | int mac_add_multicast(smc,addr,can) |
1145 | struct s_smc *smc ; | 1121 | struct s_smc *smc ; |
1146 | struct fddi_addr *addr ; | 1122 | struct fddi_addr *addr ; |
@@ -1203,52 +1179,6 @@ int mac_add_multicast(struct s_smc *smc, struct fddi_addr *addr, int can) | |||
1203 | } | 1179 | } |
1204 | 1180 | ||
1205 | /* | 1181 | /* |
1206 | BEGIN_MANUAL_ENTRY(if,func;others;2) | ||
1207 | |||
1208 | void mac_del_multicast(smc,addr,can) | ||
1209 | struct s_smc *smc ; | ||
1210 | struct fddi_addr *addr ; | ||
1211 | int can ; | ||
1212 | |||
1213 | Function DOWNCALL (SMT, fplustm.c) | ||
1214 | Delete an entry from the multicast table | ||
1215 | |||
1216 | Para addr pointer to a multicast address | ||
1217 | can = 0: the multicast address has the physical format | ||
1218 | = 1: the multicast address has the canonical format | ||
1219 | | 0x80 permanent | ||
1220 | |||
1221 | END_MANUAL_ENTRY() | ||
1222 | */ | ||
1223 | void mac_del_multicast(struct s_smc *smc, struct fddi_addr *addr, int can) | ||
1224 | { | ||
1225 | SK_LOC_DECL(struct fddi_addr,own) ; | ||
1226 | struct s_fpmc *tb ; | ||
1227 | |||
1228 | if (!(tb = mac_get_mc_table(smc,addr,&own,1,can & ~0x80))) | ||
1229 | return ; | ||
1230 | /* | ||
1231 | * permanent addresses must be deleted with perm bit | ||
1232 | * and vice versa | ||
1233 | */ | ||
1234 | if (( tb->perm && (can & 0x80)) || | ||
1235 | (!tb->perm && !(can & 0x80))) { | ||
1236 | /* | ||
1237 | * delete it | ||
1238 | */ | ||
1239 | if (tb->n) { | ||
1240 | tb->n-- ; | ||
1241 | if (tb->perm) { | ||
1242 | smc->hw.fp.smt_slots_used-- ; | ||
1243 | } | ||
1244 | else { | ||
1245 | smc->hw.fp.os_slots_used-- ; | ||
1246 | } | ||
1247 | } | ||
1248 | } | ||
1249 | } | ||
1250 | |||
1251 | /* | ||
1252 | * mode | 1182 | * mode |
1253 | */ | 1183 | */ |
1254 | 1184 | ||
diff --git a/drivers/net/skfp/h/cmtdef.h b/drivers/net/skfp/h/cmtdef.h index 603982debc71..f2f771d8be76 100644 --- a/drivers/net/skfp/h/cmtdef.h +++ b/drivers/net/skfp/h/cmtdef.h | |||
@@ -507,7 +507,6 @@ void pcm_status_state(struct s_smc *smc, int np, int *type, int *state, | |||
507 | int *remote, int *mac); | 507 | int *remote, int *mac); |
508 | void plc_config_mux(struct s_smc *smc, int mux); | 508 | void plc_config_mux(struct s_smc *smc, int mux); |
509 | void sm_lem_evaluate(struct s_smc *smc); | 509 | void sm_lem_evaluate(struct s_smc *smc); |
510 | void smt_clear_una_dna(struct s_smc *smc); | ||
511 | void mac_update_counter(struct s_smc *smc); | 510 | void mac_update_counter(struct s_smc *smc); |
512 | void sm_pm_ls_latch(struct s_smc *smc, int phy, int on_off); | 511 | void sm_pm_ls_latch(struct s_smc *smc, int phy, int on_off); |
513 | void sm_ma_control(struct s_smc *smc, int mode); | 512 | void sm_ma_control(struct s_smc *smc, int mode); |
@@ -541,11 +540,9 @@ void smt_timer_poll(struct s_smc *smc); | |||
541 | u_long smt_get_time(void); | 540 | u_long smt_get_time(void); |
542 | u_long smt_get_tid(struct s_smc *smc); | 541 | u_long smt_get_tid(struct s_smc *smc); |
543 | void smt_timer_done(struct s_smc *smc); | 542 | void smt_timer_done(struct s_smc *smc); |
544 | void smt_set_defaults(struct s_smc *smc); | ||
545 | void smt_fixup_mib(struct s_smc *smc); | 543 | void smt_fixup_mib(struct s_smc *smc); |
546 | void smt_reset_defaults(struct s_smc *smc, int level); | 544 | void smt_reset_defaults(struct s_smc *smc, int level); |
547 | void smt_agent_task(struct s_smc *smc); | 545 | void smt_agent_task(struct s_smc *smc); |
548 | void smt_please_reconnect(struct s_smc *smc, int reconn_time); | ||
549 | int smt_check_para(struct s_smc *smc, struct smt_header *sm, | 546 | int smt_check_para(struct s_smc *smc, struct smt_header *sm, |
550 | const u_short list[]); | 547 | const u_short list[]); |
551 | void driver_get_bia(struct s_smc *smc, struct fddi_addr *bia_addr); | 548 | void driver_get_bia(struct s_smc *smc, struct fddi_addr *bia_addr); |
@@ -568,7 +565,6 @@ int pcm_get_s_port(struct s_smc *smc); | |||
568 | int pcm_rooted_station(struct s_smc *smc); | 565 | int pcm_rooted_station(struct s_smc *smc); |
569 | int cfm_get_mac_input(struct s_smc *smc); | 566 | int cfm_get_mac_input(struct s_smc *smc); |
570 | int cfm_get_mac_output(struct s_smc *smc); | 567 | int cfm_get_mac_output(struct s_smc *smc); |
571 | int port_to_mib(struct s_smc *smc, int p); | ||
572 | int cem_build_path(struct s_smc *smc, char *to, int path_index); | 568 | int cem_build_path(struct s_smc *smc, char *to, int path_index); |
573 | int sm_mac_get_tx_state(struct s_smc *smc); | 569 | int sm_mac_get_tx_state(struct s_smc *smc); |
574 | char *get_pcmstate(struct s_smc *smc, int np); | 570 | char *get_pcmstate(struct s_smc *smc, int np); |
@@ -580,8 +576,6 @@ void smt_send_frame(struct s_smc *smc, SMbuf *mb, int fc, int local); | |||
580 | void smt_set_timestamp(struct s_smc *smc, u_char *p); | 576 | void smt_set_timestamp(struct s_smc *smc, u_char *p); |
581 | void mac_set_rx_mode(struct s_smc *smc, int mode); | 577 | void mac_set_rx_mode(struct s_smc *smc, int mode); |
582 | int mac_add_multicast(struct s_smc *smc, struct fddi_addr *addr, int can); | 578 | int mac_add_multicast(struct s_smc *smc, struct fddi_addr *addr, int can); |
583 | int mac_set_func_addr(struct s_smc *smc, u_long f_addr); | ||
584 | void mac_del_multicast(struct s_smc *smc, struct fddi_addr *addr, int can); | ||
585 | void mac_update_multicast(struct s_smc *smc); | 579 | void mac_update_multicast(struct s_smc *smc); |
586 | void mac_clear_multicast(struct s_smc *smc); | 580 | void mac_clear_multicast(struct s_smc *smc); |
587 | void set_formac_tsync(struct s_smc *smc, long sync_bw); | 581 | void set_formac_tsync(struct s_smc *smc, long sync_bw); |
@@ -599,7 +593,6 @@ void plc_irq(struct s_smc *smc, int np, unsigned int cmd); | |||
599 | int smt_set_mac_opvalues(struct s_smc *smc); | 593 | int smt_set_mac_opvalues(struct s_smc *smc); |
600 | 594 | ||
601 | #ifdef TAG_MODE | 595 | #ifdef TAG_MODE |
602 | void mac_drv_pci_fix(struct s_smc *smc, u_long fix_value); | ||
603 | void mac_do_pci_fix(struct s_smc *smc); | 596 | void mac_do_pci_fix(struct s_smc *smc); |
604 | void mac_drv_clear_tx_queue(struct s_smc *smc); | 597 | void mac_drv_clear_tx_queue(struct s_smc *smc); |
605 | void mac_drv_repair_descr(struct s_smc *smc); | 598 | void mac_drv_repair_descr(struct s_smc *smc); |
diff --git a/drivers/net/skfp/h/hwmtm.h b/drivers/net/skfp/h/hwmtm.h index 4e360af07d77..1a606d4bfe5e 100644 --- a/drivers/net/skfp/h/hwmtm.h +++ b/drivers/net/skfp/h/hwmtm.h | |||
@@ -262,31 +262,6 @@ struct os_debug { | |||
262 | (smc)->hw.fp.tx_q[queue].tx_curr_put | 262 | (smc)->hw.fp.tx_q[queue].tx_curr_put |
263 | 263 | ||
264 | /* | 264 | /* |
265 | * BEGIN_MANUAL_ENTRY(HWM_TX_CHECK) | ||
266 | * void HWM_TX_CHECK(smc,frame_status,low_water) | ||
267 | * | ||
268 | * function MACRO (hardware module, hwmtm.h) | ||
269 | * This macro is invoked by the OS-specific before it left it's | ||
270 | * driver_send function. This macro calls mac_drv_clear_txd | ||
271 | * if the free TxDs of the current transmit queue is equal or | ||
272 | * lower than the given low water mark. | ||
273 | * | ||
274 | * para frame_status status of the frame, see design description | ||
275 | * low_water low water mark of free TxD's | ||
276 | * | ||
277 | * END_MANUAL_ENTRY | ||
278 | */ | ||
279 | #ifndef HWM_NO_FLOW_CTL | ||
280 | #define HWM_TX_CHECK(smc,frame_status,low_water) {\ | ||
281 | if ((low_water)>=(smc)->hw.fp.tx_q[(frame_status)&QUEUE_A0].tx_free) {\ | ||
282 | mac_drv_clear_txd(smc) ;\ | ||
283 | }\ | ||
284 | } | ||
285 | #else | ||
286 | #define HWM_TX_CHECK(smc,frame_status,low_water) mac_drv_clear_txd(smc) | ||
287 | #endif | ||
288 | |||
289 | /* | ||
290 | * BEGIN_MANUAL_ENTRY(HWM_GET_RX_FRAG_LEN) | 265 | * BEGIN_MANUAL_ENTRY(HWM_GET_RX_FRAG_LEN) |
291 | * int HWM_GET_RX_FRAG_LEN(rxd) | 266 | * int HWM_GET_RX_FRAG_LEN(rxd) |
292 | * | 267 | * |
diff --git a/drivers/net/skfp/hwmtm.c b/drivers/net/skfp/hwmtm.c index 18d429021edb..438f424e6361 100644 --- a/drivers/net/skfp/hwmtm.c +++ b/drivers/net/skfp/hwmtm.c | |||
@@ -86,6 +86,7 @@ static u_long repair_txd_ring(struct s_smc *smc, struct s_smt_tx_queue *queue); | |||
86 | static u_long repair_rxd_ring(struct s_smc *smc, struct s_smt_rx_queue *queue); | 86 | static u_long repair_rxd_ring(struct s_smc *smc, struct s_smt_rx_queue *queue); |
87 | static SMbuf* get_llc_rx(struct s_smc *smc); | 87 | static SMbuf* get_llc_rx(struct s_smc *smc); |
88 | static SMbuf* get_txd_mb(struct s_smc *smc); | 88 | static SMbuf* get_txd_mb(struct s_smc *smc); |
89 | static void mac_drv_clear_txd(struct s_smc *smc); | ||
89 | 90 | ||
90 | /* | 91 | /* |
91 | ------------------------------------------------------------- | 92 | ------------------------------------------------------------- |
@@ -146,7 +147,6 @@ extern int mac_drv_rx_init(struct s_smc *smc, int len, int fc, char *look_ahead, | |||
146 | */ | 147 | */ |
147 | void process_receive(struct s_smc *smc); | 148 | void process_receive(struct s_smc *smc); |
148 | void fddi_isr(struct s_smc *smc); | 149 | void fddi_isr(struct s_smc *smc); |
149 | void mac_drv_clear_txd(struct s_smc *smc); | ||
150 | void smt_free_mbuf(struct s_smc *smc, SMbuf *mb); | 150 | void smt_free_mbuf(struct s_smc *smc, SMbuf *mb); |
151 | void init_driver_fplus(struct s_smc *smc); | 151 | void init_driver_fplus(struct s_smc *smc); |
152 | void mac_drv_rx_mode(struct s_smc *smc, int mode); | 152 | void mac_drv_rx_mode(struct s_smc *smc, int mode); |
@@ -158,7 +158,6 @@ void hwm_tx_frag(struct s_smc *smc, char far *virt, u_long phys, int len, | |||
158 | void hwm_rx_frag(struct s_smc *smc, char far *virt, u_long phys, int len, | 158 | void hwm_rx_frag(struct s_smc *smc, char far *virt, u_long phys, int len, |
159 | int frame_status); | 159 | int frame_status); |
160 | 160 | ||
161 | int mac_drv_rx_frag(struct s_smc *smc, void far *virt, int len); | ||
162 | int mac_drv_init(struct s_smc *smc); | 161 | int mac_drv_init(struct s_smc *smc); |
163 | int hwm_tx_init(struct s_smc *smc, u_char fc, int frag_count, int frame_len, | 162 | int hwm_tx_init(struct s_smc *smc, u_char fc, int frag_count, int frame_len, |
164 | int frame_status); | 163 | int frame_status); |
@@ -1448,35 +1447,6 @@ void hwm_rx_frag(struct s_smc *smc, char far *virt, u_long phys, int len, | |||
1448 | NDD_TRACE("RHfE",r,AIX_REVERSE(r->rxd_rbadr),0) ; | 1447 | NDD_TRACE("RHfE",r,AIX_REVERSE(r->rxd_rbadr),0) ; |
1449 | } | 1448 | } |
1450 | 1449 | ||
1451 | #ifndef NDIS_OS2 | ||
1452 | /* | ||
1453 | * BEGIN_MANUAL_ENTRY(mac_drv_rx_frag) | ||
1454 | * int mac_drv_rx_frag(smc,virt,len) | ||
1455 | * | ||
1456 | * function DOWNCALL (hwmtm.c) | ||
1457 | * mac_drv_rx_frag fills the fragment with a part of the frame. | ||
1458 | * | ||
1459 | * para virt the virtual address of the fragment | ||
1460 | * len the length in bytes of the fragment | ||
1461 | * | ||
1462 | * return 0: success code, no errors possible | ||
1463 | * | ||
1464 | * END_MANUAL_ENTRY | ||
1465 | */ | ||
1466 | int mac_drv_rx_frag(struct s_smc *smc, void far *virt, int len) | ||
1467 | { | ||
1468 | NDD_TRACE("RHSB",virt,len,smc->os.hwm.r.mb_pos) ; | ||
1469 | |||
1470 | DB_RX("receive from queue: len/virt: = %d/%x",len,virt,4) ; | ||
1471 | memcpy((char far *)virt,smc->os.hwm.r.mb_pos,len) ; | ||
1472 | smc->os.hwm.r.mb_pos += len ; | ||
1473 | |||
1474 | NDD_TRACE("RHSE",smc->os.hwm.r.mb_pos,0,0) ; | ||
1475 | return(0) ; | ||
1476 | } | ||
1477 | #endif | ||
1478 | |||
1479 | |||
1480 | /* | 1450 | /* |
1481 | * BEGINN_MANUAL_ENTRY(mac_drv_clear_rx_queue) | 1451 | * BEGINN_MANUAL_ENTRY(mac_drv_clear_rx_queue) |
1482 | * | 1452 | * |
@@ -1978,7 +1948,7 @@ void smt_send_mbuf(struct s_smc *smc, SMbuf *mb, int fc) | |||
1978 | * | 1948 | * |
1979 | * END_MANUAL_ENTRY | 1949 | * END_MANUAL_ENTRY |
1980 | */ | 1950 | */ |
1981 | void mac_drv_clear_txd(struct s_smc *smc) | 1951 | static void mac_drv_clear_txd(struct s_smc *smc) |
1982 | { | 1952 | { |
1983 | struct s_smt_tx_queue *queue ; | 1953 | struct s_smt_tx_queue *queue ; |
1984 | struct s_smt_fp_txd volatile *t1 ; | 1954 | struct s_smt_fp_txd volatile *t1 ; |
diff --git a/drivers/net/skfp/pcmplc.c b/drivers/net/skfp/pcmplc.c index 571f055c096b..cd0aa4c151b0 100644 --- a/drivers/net/skfp/pcmplc.c +++ b/drivers/net/skfp/pcmplc.c | |||
@@ -1861,13 +1861,6 @@ void plc_irq(struct s_smc *smc, int np, unsigned int cmd) | |||
1861 | #endif | 1861 | #endif |
1862 | } | 1862 | } |
1863 | 1863 | ||
1864 | void pcm_set_lct_short(struct s_smc *smc, int n) | ||
1865 | { | ||
1866 | if (n <= 0 || n > 1000) | ||
1867 | return ; | ||
1868 | smc->s.lct_short = n ; | ||
1869 | } | ||
1870 | |||
1871 | #ifdef DEBUG | 1864 | #ifdef DEBUG |
1872 | /* | 1865 | /* |
1873 | * fill state struct | 1866 | * fill state struct |
diff --git a/drivers/net/skfp/pmf.c b/drivers/net/skfp/pmf.c index f2b446d8b0bf..efc639c013fd 100644 --- a/drivers/net/skfp/pmf.c +++ b/drivers/net/skfp/pmf.c | |||
@@ -36,12 +36,13 @@ static int smt_authorize(struct s_smc *smc, struct smt_header *sm); | |||
36 | static int smt_check_set_count(struct s_smc *smc, struct smt_header *sm); | 36 | static int smt_check_set_count(struct s_smc *smc, struct smt_header *sm); |
37 | static const struct s_p_tab* smt_get_ptab(u_short para); | 37 | static const struct s_p_tab* smt_get_ptab(u_short para); |
38 | static int smt_mib_phys(struct s_smc *smc); | 38 | static int smt_mib_phys(struct s_smc *smc); |
39 | int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index, int local, | 39 | static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index, |
40 | int set); | 40 | int local, int set); |
41 | void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para, | 41 | void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para, |
42 | int index, int local); | 42 | int index, int local); |
43 | static SMbuf *smt_build_pmf_response(struct s_smc *smc, struct smt_header *req, | 43 | static SMbuf *smt_build_pmf_response(struct s_smc *smc, struct smt_header *req, |
44 | int set, int local); | 44 | int set, int local); |
45 | static int port_to_mib(struct s_smc *smc, int p); | ||
45 | 46 | ||
46 | #define MOFFSS(e) ((int)&(((struct fddi_mib *)0)->e)) | 47 | #define MOFFSS(e) ((int)&(((struct fddi_mib *)0)->e)) |
47 | #define MOFFSA(e) ((int) (((struct fddi_mib *)0)->e)) | 48 | #define MOFFSA(e) ((int) (((struct fddi_mib *)0)->e)) |
@@ -1078,8 +1079,8 @@ wrong_error: | |||
1078 | /* | 1079 | /* |
1079 | * set parameter | 1080 | * set parameter |
1080 | */ | 1081 | */ |
1081 | int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index, int local, | 1082 | static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index, |
1082 | int set) | 1083 | int local, int set) |
1083 | { | 1084 | { |
1084 | #define IFSET(x) if (set) (x) | 1085 | #define IFSET(x) if (set) (x) |
1085 | 1086 | ||
@@ -1549,7 +1550,7 @@ static int smt_mib_phys(struct s_smc *smc) | |||
1549 | #endif | 1550 | #endif |
1550 | } | 1551 | } |
1551 | 1552 | ||
1552 | int port_to_mib(struct s_smc *smc, int p) | 1553 | static int port_to_mib(struct s_smc *smc, int p) |
1553 | { | 1554 | { |
1554 | #ifdef CONCENTRATOR | 1555 | #ifdef CONCENTRATOR |
1555 | SK_UNUSED(smc) ; | 1556 | SK_UNUSED(smc) ; |
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index c88aad6edd74..4b5ed2c63177 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c | |||
@@ -149,7 +149,6 @@ extern void hwm_rx_frag(struct s_smc *smc, char far * virt, u_long phys, | |||
149 | extern void mac_drv_rx_mode(struct s_smc *smc, int mode); | 149 | extern void mac_drv_rx_mode(struct s_smc *smc, int mode); |
150 | extern void mac_drv_clear_rx_queue(struct s_smc *smc); | 150 | extern void mac_drv_clear_rx_queue(struct s_smc *smc); |
151 | extern void enable_tx_irq(struct s_smc *smc, u_short queue); | 151 | extern void enable_tx_irq(struct s_smc *smc, u_short queue); |
152 | extern void mac_drv_clear_txd(struct s_smc *smc); | ||
153 | 152 | ||
154 | static struct pci_device_id skfddi_pci_tbl[] = { | 153 | static struct pci_device_id skfddi_pci_tbl[] = { |
155 | { PCI_VENDOR_ID_SK, PCI_DEVICE_ID_SK_FP, PCI_ANY_ID, PCI_ANY_ID, }, | 154 | { PCI_VENDOR_ID_SK, PCI_DEVICE_ID_SK_FP, PCI_ANY_ID, PCI_ANY_ID, }, |
diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c index c3a0d2f10b2b..f17c05cbe44b 100644 --- a/drivers/net/skfp/smt.c +++ b/drivers/net/skfp/smt.c | |||
@@ -110,7 +110,7 @@ static void smt_fill_setcount(struct s_smc *smc, struct smt_p_setcount *setcount | |||
110 | static void smt_fill_echo(struct s_smc *smc, struct smt_p_echo *echo, u_long seed, | 110 | static void smt_fill_echo(struct s_smc *smc, struct smt_p_echo *echo, u_long seed, |
111 | int len); | 111 | int len); |
112 | 112 | ||
113 | void smt_clear_una_dna(struct s_smc *smc); | 113 | static void smt_clear_una_dna(struct s_smc *smc); |
114 | static void smt_clear_old_una_dna(struct s_smc *smc); | 114 | static void smt_clear_old_una_dna(struct s_smc *smc); |
115 | #ifdef CONCENTRATOR | 115 | #ifdef CONCENTRATOR |
116 | static int entity_to_index(void); | 116 | static int entity_to_index(void); |
@@ -118,7 +118,7 @@ static int entity_to_index(void); | |||
118 | static void update_dac(struct s_smc *smc, int report); | 118 | static void update_dac(struct s_smc *smc, int report); |
119 | static int div_ratio(u_long upper, u_long lower); | 119 | static int div_ratio(u_long upper, u_long lower); |
120 | #ifdef USE_CAN_ADDR | 120 | #ifdef USE_CAN_ADDR |
121 | void hwm_conv_can(struct s_smc *smc, char *data, int len); | 121 | static void hwm_conv_can(struct s_smc *smc, char *data, int len); |
122 | #else | 122 | #else |
123 | #define hwm_conv_can(smc,data,len) | 123 | #define hwm_conv_can(smc,data,len) |
124 | #endif | 124 | #endif |
@@ -216,24 +216,6 @@ void smt_agent_task(struct s_smc *smc) | |||
216 | DB_SMT("SMT agent task\n",0,0) ; | 216 | DB_SMT("SMT agent task\n",0,0) ; |
217 | } | 217 | } |
218 | 218 | ||
219 | void smt_please_reconnect(struct s_smc *smc, int reconn_time) | ||
220 | /* struct s_smc *smc; Pointer to SMT context */ | ||
221 | /* int reconn_time; Wait for reconnect time in seconds */ | ||
222 | { | ||
223 | /* | ||
224 | * The please reconnect variable is used as a timer. | ||
225 | * It is decremented each time smt_event is called. | ||
226 | * This happens every second or when smt_force_irq is called. | ||
227 | * Note: smt_force_irq () is called on some packet receives and | ||
228 | * when a multicast address is changed. Since nothing | ||
229 | * is received during the disconnect and the multicast | ||
230 | * address changes can be viewed as not very often and | ||
231 | * the timer runs out close to its given value | ||
232 | * (reconn_time). | ||
233 | */ | ||
234 | smc->sm.please_reconnect = reconn_time ; | ||
235 | } | ||
236 | |||
237 | #ifndef SMT_REAL_TOKEN_CT | 219 | #ifndef SMT_REAL_TOKEN_CT |
238 | void smt_emulate_token_ct(struct s_smc *smc, int mac_index) | 220 | void smt_emulate_token_ct(struct s_smc *smc, int mac_index) |
239 | { | 221 | { |
@@ -1574,7 +1556,7 @@ static void smt_fill_echo(struct s_smc *smc, struct smt_p_echo *echo, u_long see | |||
1574 | * clear DNA and UNA | 1556 | * clear DNA and UNA |
1575 | * called from CFM if configuration changes | 1557 | * called from CFM if configuration changes |
1576 | */ | 1558 | */ |
1577 | void smt_clear_una_dna(struct s_smc *smc) | 1559 | static void smt_clear_una_dna(struct s_smc *smc) |
1578 | { | 1560 | { |
1579 | smc->mib.m[MAC0].fddiMACUpstreamNbr = SMT_Unknown ; | 1561 | smc->mib.m[MAC0].fddiMACUpstreamNbr = SMT_Unknown ; |
1580 | smc->mib.m[MAC0].fddiMACDownstreamNbr = SMT_Unknown ; | 1562 | smc->mib.m[MAC0].fddiMACDownstreamNbr = SMT_Unknown ; |
@@ -2058,30 +2040,10 @@ int smt_action(struct s_smc *smc, int class, int code, int index) | |||
2058 | } | 2040 | } |
2059 | 2041 | ||
2060 | /* | 2042 | /* |
2061 | * change tneg | ||
2062 | * set T_Req in MIB (Path Attribute) | ||
2063 | * calculate new values for MAC | ||
2064 | * if change required | ||
2065 | * disconnect | ||
2066 | * set reconnect | ||
2067 | * end | ||
2068 | */ | ||
2069 | void smt_change_t_neg(struct s_smc *smc, u_long tneg) | ||
2070 | { | ||
2071 | smc->mib.a[PATH0].fddiPATHMaxT_Req = tneg ; | ||
2072 | |||
2073 | if (smt_set_mac_opvalues(smc)) { | ||
2074 | RS_SET(smc,RS_EVENT) ; | ||
2075 | smc->sm.please_reconnect = 1 ; | ||
2076 | queue_event(smc,EVENT_ECM,EC_DISCONNECT) ; | ||
2077 | } | ||
2078 | } | ||
2079 | |||
2080 | /* | ||
2081 | * canonical conversion of <len> bytes beginning form *data | 2043 | * canonical conversion of <len> bytes beginning form *data |
2082 | */ | 2044 | */ |
2083 | #ifdef USE_CAN_ADDR | 2045 | #ifdef USE_CAN_ADDR |
2084 | void hwm_conv_can(struct s_smc *smc, char *data, int len) | 2046 | static void hwm_conv_can(struct s_smc *smc, char *data, int len) |
2085 | { | 2047 | { |
2086 | int i ; | 2048 | int i ; |
2087 | 2049 | ||
diff --git a/drivers/net/skfp/smtdef.c b/drivers/net/skfp/smtdef.c index 5a0c8db816d8..4e07ff7073f1 100644 --- a/drivers/net/skfp/smtdef.c +++ b/drivers/net/skfp/smtdef.c | |||
@@ -76,11 +76,6 @@ void smt_reset_defaults(struct s_smc *smc, int level); | |||
76 | static void smt_init_mib(struct s_smc *smc, int level); | 76 | static void smt_init_mib(struct s_smc *smc, int level); |
77 | static int set_min_max(int maxflag, u_long mib, u_long limit, u_long *oper); | 77 | static int set_min_max(int maxflag, u_long mib, u_long limit, u_long *oper); |
78 | 78 | ||
79 | void smt_set_defaults(struct s_smc *smc) | ||
80 | { | ||
81 | smt_reset_defaults(smc,0) ; | ||
82 | } | ||
83 | |||
84 | #define MS2BCLK(x) ((x)*12500L) | 79 | #define MS2BCLK(x) ((x)*12500L) |
85 | #define US2BCLK(x) ((x)*1250L) | 80 | #define US2BCLK(x) ((x)*1250L) |
86 | 81 | ||
diff --git a/drivers/net/skfp/smtparse.c b/drivers/net/skfp/smtparse.c deleted file mode 100644 index d5779e414dbe..000000000000 --- a/drivers/net/skfp/smtparse.c +++ /dev/null | |||
@@ -1,467 +0,0 @@ | |||
1 | /****************************************************************************** | ||
2 | * | ||
3 | * (C)Copyright 1998,1999 SysKonnect, | ||
4 | * a business unit of Schneider & Koch & Co. Datensysteme GmbH. | ||
5 | * | ||
6 | * See the file "skfddi.c" for further information. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License as published by | ||
10 | * the Free Software Foundation; either version 2 of the License, or | ||
11 | * (at your option) any later version. | ||
12 | * | ||
13 | * The information in this file is provided "AS IS" without warranty. | ||
14 | * | ||
15 | ******************************************************************************/ | ||
16 | |||
17 | |||
18 | /* | ||
19 | parser for SMT parameters | ||
20 | */ | ||
21 | |||
22 | #include "h/types.h" | ||
23 | #include "h/fddi.h" | ||
24 | #include "h/smc.h" | ||
25 | #include "h/smt_p.h" | ||
26 | |||
27 | #define KERNEL | ||
28 | #include "h/smtstate.h" | ||
29 | |||
30 | #ifndef lint | ||
31 | static const char ID_sccs[] = "@(#)smtparse.c 1.12 98/10/06 (C) SK " ; | ||
32 | #endif | ||
33 | |||
34 | #ifdef sun | ||
35 | #define _far | ||
36 | #endif | ||
37 | |||
38 | /* | ||
39 | * convert to BCLK units | ||
40 | */ | ||
41 | #define MS2BCLK(x) ((x)*12500L) | ||
42 | #define US2BCLK(x) ((x/10)*125L) | ||
43 | |||
44 | /* | ||
45 | * parameter table | ||
46 | */ | ||
47 | static struct s_ptab { | ||
48 | char *pt_name ; | ||
49 | u_short pt_num ; | ||
50 | u_short pt_type ; | ||
51 | u_long pt_min ; | ||
52 | u_long pt_max ; | ||
53 | } ptab[] = { | ||
54 | { "PMFPASSWD",0, 0 } , | ||
55 | { "USERDATA",1, 0 } , | ||
56 | { "LERCUTOFFA",2, 1, 4, 15 } , | ||
57 | { "LERCUTOFFB",3, 1, 4, 15 } , | ||
58 | { "LERALARMA",4, 1, 4, 15 } , | ||
59 | { "LERALARMB",5, 1, 4, 15 } , | ||
60 | { "TMAX",6, 1, 5, 165 } , | ||
61 | { "TMIN",7, 1, 5, 165 } , | ||
62 | { "TREQ",8, 1, 5, 165 } , | ||
63 | { "TVX",9, 1, 2500, 10000 } , | ||
64 | #ifdef ESS | ||
65 | { "SBAPAYLOAD",10, 1, 0, 1562 } , | ||
66 | { "SBAOVERHEAD",11, 1, 50, 5000 } , | ||
67 | { "MAXTNEG",12, 1, 5, 165 } , | ||
68 | { "MINSEGMENTSIZE",13, 1, 0, 4478 } , | ||
69 | { "SBACATEGORY",14, 1, 0, 0xffff } , | ||
70 | { "SYNCHTXMODE",15, 0 } , | ||
71 | #endif | ||
72 | #ifdef SBA | ||
73 | { "SBACOMMAND",16, 0 } , | ||
74 | { "SBAAVAILABLE",17, 1, 0, 100 } , | ||
75 | #endif | ||
76 | { NULL } | ||
77 | } ; | ||
78 | |||
79 | /* Define maximum string size for values and keybuffer */ | ||
80 | #define MAX_VAL 40 | ||
81 | |||
82 | /* | ||
83 | * local function declarations | ||
84 | */ | ||
85 | static u_long parse_num(int type, char _far *value, char *v, u_long mn, | ||
86 | u_long mx, int scale); | ||
87 | static int parse_word(char *buf, char _far *text); | ||
88 | |||
89 | #ifdef SIM | ||
90 | #define DB_MAIN(a,b,c) printf(a,b,c) | ||
91 | #else | ||
92 | #define DB_MAIN(a,b,c) | ||
93 | #endif | ||
94 | |||
95 | /* | ||
96 | * BEGIN_MANUAL_ENTRY() | ||
97 | * | ||
98 | * int smt_parse_arg(struct s_smc *,char _far *keyword,int type, | ||
99 | char _far *value) | ||
100 | * | ||
101 | * parse SMT parameter | ||
102 | * *keyword | ||
103 | * pointer to keyword, must be \0, \n or \r terminated | ||
104 | * *value pointer to value, either char * or u_long * | ||
105 | * if char * | ||
106 | * pointer to value, must be \0, \n or \r terminated | ||
107 | * if u_long * | ||
108 | * contains binary value | ||
109 | * | ||
110 | * type 0: integer | ||
111 | * 1: string | ||
112 | * return | ||
113 | * 0 parameter parsed ok | ||
114 | * != 0 error | ||
115 | * NOTE: | ||
116 | * function can be called with DS != SS | ||
117 | * | ||
118 | * | ||
119 | * END_MANUAL_ENTRY() | ||
120 | */ | ||
121 | int smt_parse_arg(struct s_smc *smc, char _far *keyword, int type, | ||
122 | char _far *value) | ||
123 | { | ||
124 | char keybuf[MAX_VAL+1]; | ||
125 | char valbuf[MAX_VAL+1]; | ||
126 | char c ; | ||
127 | char *p ; | ||
128 | char *v ; | ||
129 | char *d ; | ||
130 | u_long val = 0 ; | ||
131 | struct s_ptab *pt ; | ||
132 | int st ; | ||
133 | int i ; | ||
134 | |||
135 | /* | ||
136 | * parse keyword | ||
137 | */ | ||
138 | if ((st = parse_word(keybuf,keyword))) | ||
139 | return(st) ; | ||
140 | /* | ||
141 | * parse value if given as string | ||
142 | */ | ||
143 | if (type == 1) { | ||
144 | if ((st = parse_word(valbuf,value))) | ||
145 | return(st) ; | ||
146 | } | ||
147 | /* | ||
148 | * search in table | ||
149 | */ | ||
150 | st = 0 ; | ||
151 | for (pt = ptab ; (v = pt->pt_name) ; pt++) { | ||
152 | for (p = keybuf ; (c = *p) ; p++,v++) { | ||
153 | if (c != *v) | ||
154 | break ; | ||
155 | } | ||
156 | if (!c && !*v) | ||
157 | break ; | ||
158 | } | ||
159 | if (!v) | ||
160 | return(-1) ; | ||
161 | #if 0 | ||
162 | printf("=>%s<==>%s<=\n",pt->pt_name,valbuf) ; | ||
163 | #endif | ||
164 | /* | ||
165 | * set value in MIB | ||
166 | */ | ||
167 | if (pt->pt_type) | ||
168 | val = parse_num(type,value,valbuf,pt->pt_min,pt->pt_max,1) ; | ||
169 | switch (pt->pt_num) { | ||
170 | case 0 : | ||
171 | v = valbuf ; | ||
172 | d = (char *) smc->mib.fddiPRPMFPasswd ; | ||
173 | for (i = 0 ; i < (signed)sizeof(smc->mib.fddiPRPMFPasswd) ; i++) | ||
174 | *d++ = *v++ ; | ||
175 | DB_MAIN("SET %s = %s\n",pt->pt_name,smc->mib.fddiPRPMFPasswd) ; | ||
176 | break ; | ||
177 | case 1 : | ||
178 | v = valbuf ; | ||
179 | d = (char *) smc->mib.fddiSMTUserData ; | ||
180 | for (i = 0 ; i < (signed)sizeof(smc->mib.fddiSMTUserData) ; i++) | ||
181 | *d++ = *v++ ; | ||
182 | DB_MAIN("SET %s = %s\n",pt->pt_name,smc->mib.fddiSMTUserData) ; | ||
183 | break ; | ||
184 | case 2 : | ||
185 | smc->mib.p[PA].fddiPORTLer_Cutoff = (u_char) val ; | ||
186 | DB_MAIN("SET %s = %d\n", | ||
187 | pt->pt_name,smc->mib.p[PA].fddiPORTLer_Cutoff) ; | ||
188 | break ; | ||
189 | case 3 : | ||
190 | smc->mib.p[PB].fddiPORTLer_Cutoff = (u_char) val ; | ||
191 | DB_MAIN("SET %s = %d\n", | ||
192 | pt->pt_name,smc->mib.p[PB].fddiPORTLer_Cutoff) ; | ||
193 | break ; | ||
194 | case 4 : | ||
195 | smc->mib.p[PA].fddiPORTLer_Alarm = (u_char) val ; | ||
196 | DB_MAIN("SET %s = %d\n", | ||
197 | pt->pt_name,smc->mib.p[PA].fddiPORTLer_Alarm) ; | ||
198 | break ; | ||
199 | case 5 : | ||
200 | smc->mib.p[PB].fddiPORTLer_Alarm = (u_char) val ; | ||
201 | DB_MAIN("SET %s = %d\n", | ||
202 | pt->pt_name,smc->mib.p[PB].fddiPORTLer_Alarm) ; | ||
203 | break ; | ||
204 | case 6 : /* TMAX */ | ||
205 | DB_MAIN("SET %s = %d\n",pt->pt_name,val) ; | ||
206 | smc->mib.a[PATH0].fddiPATHT_MaxLowerBound = | ||
207 | (u_long) -MS2BCLK((long)val) ; | ||
208 | break ; | ||
209 | case 7 : /* TMIN */ | ||
210 | DB_MAIN("SET %s = %d\n",pt->pt_name,val) ; | ||
211 | smc->mib.m[MAC0].fddiMACT_Min = | ||
212 | (u_long) -MS2BCLK((long)val) ; | ||
213 | break ; | ||
214 | case 8 : /* TREQ */ | ||
215 | DB_MAIN("SET %s = %d\n",pt->pt_name,val) ; | ||
216 | smc->mib.a[PATH0].fddiPATHMaxT_Req = | ||
217 | (u_long) -MS2BCLK((long)val) ; | ||
218 | break ; | ||
219 | case 9 : /* TVX */ | ||
220 | DB_MAIN("SET %s = %d \n",pt->pt_name,val) ; | ||
221 | smc->mib.a[PATH0].fddiPATHTVXLowerBound = | ||
222 | (u_long) -US2BCLK((long)val) ; | ||
223 | break ; | ||
224 | #ifdef ESS | ||
225 | case 10 : /* SBAPAYLOAD */ | ||
226 | DB_MAIN("SET %s = %d\n",pt->pt_name,val) ; | ||
227 | if (smc->mib.fddiESSPayload != val) { | ||
228 | smc->ess.raf_act_timer_poll = TRUE ; | ||
229 | smc->mib.fddiESSPayload = val ; | ||
230 | } | ||
231 | break ; | ||
232 | case 11 : /* SBAOVERHEAD */ | ||
233 | DB_MAIN("SET %s = %d\n",pt->pt_name,val) ; | ||
234 | smc->mib.fddiESSOverhead = val ; | ||
235 | break ; | ||
236 | case 12 : /* MAXTNEG */ | ||
237 | DB_MAIN("SET %s = %d\n",pt->pt_name,val) ; | ||
238 | smc->mib.fddiESSMaxTNeg = (u_long) -MS2BCLK((long)val) ; | ||
239 | break ; | ||
240 | case 13 : /* MINSEGMENTSIZE */ | ||
241 | DB_MAIN("SET %s = %d\n",pt->pt_name,val) ; | ||
242 | smc->mib.fddiESSMinSegmentSize = val ; | ||
243 | break ; | ||
244 | case 14 : /* SBACATEGORY */ | ||
245 | DB_MAIN("SET %s = %d\n",pt->pt_name,val) ; | ||
246 | smc->mib.fddiESSCategory = | ||
247 | (smc->mib.fddiESSCategory & 0xffff) | | ||
248 | ((u_long)(val << 16)) ; | ||
249 | break ; | ||
250 | case 15 : /* SYNCHTXMODE */ | ||
251 | /* do not use memcmp(valbuf,"ALL",3) because DS != SS */ | ||
252 | if (valbuf[0] == 'A' && valbuf[1] == 'L' && valbuf[2] == 'L') { | ||
253 | smc->mib.fddiESSSynchTxMode = TRUE ; | ||
254 | DB_MAIN("SET %s = %s\n",pt->pt_name,valbuf) ; | ||
255 | } | ||
256 | /* if (!memcmp(valbuf,"SPLIT",5)) { */ | ||
257 | if (valbuf[0] == 'S' && valbuf[1] == 'P' && valbuf[2] == 'L' && | ||
258 | valbuf[3] == 'I' && valbuf[4] == 'T') { | ||
259 | DB_MAIN("SET %s = %s\n",pt->pt_name,valbuf) ; | ||
260 | smc->mib.fddiESSSynchTxMode = FALSE ; | ||
261 | } | ||
262 | break ; | ||
263 | #endif | ||
264 | #ifdef SBA | ||
265 | case 16 : /* SBACOMMAND */ | ||
266 | /* if (!memcmp(valbuf,"START",5)) { */ | ||
267 | if (valbuf[0] == 'S' && valbuf[1] == 'T' && valbuf[2] == 'A' && | ||
268 | valbuf[3] == 'R' && valbuf[4] == 'T') { | ||
269 | DB_MAIN("SET %s = %s\n",pt->pt_name,valbuf) ; | ||
270 | smc->mib.fddiSBACommand = SB_START ; | ||
271 | } | ||
272 | /* if (!memcmp(valbuf,"STOP",4)) { */ | ||
273 | if (valbuf[0] == 'S' && valbuf[1] == 'T' && valbuf[2] == 'O' && | ||
274 | valbuf[3] == 'P') { | ||
275 | DB_MAIN("SET %s = %s\n",pt->pt_name,valbuf) ; | ||
276 | smc->mib.fddiSBACommand = SB_STOP ; | ||
277 | } | ||
278 | break ; | ||
279 | case 17 : /* SBAAVAILABLE */ | ||
280 | DB_MAIN("SET %s = %d\n",pt->pt_name,val) ; | ||
281 | smc->mib.fddiSBAAvailable = (u_char) val ; | ||
282 | break ; | ||
283 | #endif | ||
284 | } | ||
285 | return(0) ; | ||
286 | } | ||
287 | |||
288 | static int parse_word(char *buf, char _far *text) | ||
289 | { | ||
290 | char c ; | ||
291 | char *p ; | ||
292 | int p_len ; | ||
293 | int quote ; | ||
294 | int i ; | ||
295 | int ok ; | ||
296 | |||
297 | /* | ||
298 | * skip leading white space | ||
299 | */ | ||
300 | p = buf ; | ||
301 | for (i = 0 ; i < MAX_VAL ; i++) | ||
302 | *p++ = 0 ; | ||
303 | p = buf ; | ||
304 | p_len = 0 ; | ||
305 | ok = 0 ; | ||
306 | while ( (c = *text++) && (c != '\n') && (c != '\r')) { | ||
307 | if ((c != ' ') && (c != '\t')) { | ||
308 | ok = 1 ; | ||
309 | break ; | ||
310 | } | ||
311 | } | ||
312 | if (!ok) | ||
313 | return(-1) ; | ||
314 | if (c == '"') { | ||
315 | quote = 1 ; | ||
316 | } | ||
317 | else { | ||
318 | quote = 0 ; | ||
319 | text-- ; | ||
320 | } | ||
321 | /* | ||
322 | * parse valbuf | ||
323 | */ | ||
324 | ok = 0 ; | ||
325 | while (!ok && p_len < MAX_VAL-1 && (c = *text++) && (c != '\n') | ||
326 | && (c != '\r')) { | ||
327 | switch (quote) { | ||
328 | case 0 : | ||
329 | if ((c == ' ') || (c == '\t') || (c == '=')) { | ||
330 | ok = 1 ; | ||
331 | break ; | ||
332 | } | ||
333 | *p++ = c ; | ||
334 | p_len++ ; | ||
335 | break ; | ||
336 | case 2 : | ||
337 | *p++ = c ; | ||
338 | p_len++ ; | ||
339 | quote = 1 ; | ||
340 | break ; | ||
341 | case 1 : | ||
342 | switch (c) { | ||
343 | case '"' : | ||
344 | ok = 1 ; | ||
345 | break ; | ||
346 | case '\\' : | ||
347 | quote = 2 ; | ||
348 | break ; | ||
349 | default : | ||
350 | *p++ = c ; | ||
351 | p_len++ ; | ||
352 | } | ||
353 | } | ||
354 | } | ||
355 | *p++ = 0 ; | ||
356 | for (p = buf ; (c = *p) ; p++) { | ||
357 | if (c >= 'a' && c <= 'z') | ||
358 | *p = c + 'A' - 'a' ; | ||
359 | } | ||
360 | return(0) ; | ||
361 | } | ||
362 | |||
363 | static u_long parse_num(int type, char _far *value, char *v, u_long mn, | ||
364 | u_long mx, int scale) | ||
365 | { | ||
366 | u_long x = 0 ; | ||
367 | char c ; | ||
368 | |||
369 | if (type == 0) { /* integer */ | ||
370 | u_long _far *l ; | ||
371 | u_long u1 ; | ||
372 | |||
373 | l = (u_long _far *) value ; | ||
374 | u1 = *l ; | ||
375 | /* | ||
376 | * if the value is negative take the lower limit | ||
377 | */ | ||
378 | if ((long)u1 < 0) { | ||
379 | if (- ((long)u1) > (long) mx) { | ||
380 | u1 = 0 ; | ||
381 | } | ||
382 | else { | ||
383 | u1 = (u_long) - ((long)u1) ; | ||
384 | } | ||
385 | } | ||
386 | x = u1 ; | ||
387 | } | ||
388 | else { /* string */ | ||
389 | int sign = 0 ; | ||
390 | |||
391 | if (*v == '-') { | ||
392 | sign = 1 ; | ||
393 | } | ||
394 | while ((c = *v++) && (c >= '0') && (c <= '9')) { | ||
395 | x = x * 10 + c - '0' ; | ||
396 | } | ||
397 | if (scale == 10) { | ||
398 | x *= 10 ; | ||
399 | if (c == '.') { | ||
400 | if ((c = *v++) && (c >= '0') && (c <= '9')) { | ||
401 | x += c - '0' ; | ||
402 | } | ||
403 | } | ||
404 | } | ||
405 | if (sign) | ||
406 | x = (u_long) - ((long)x) ; | ||
407 | } | ||
408 | /* | ||
409 | * if the value is negative | ||
410 | * and the absolute value is outside the limits | ||
411 | * take the lower limit | ||
412 | * else | ||
413 | * take the absoute value | ||
414 | */ | ||
415 | if ((long)x < 0) { | ||
416 | if (- ((long)x) > (long) mx) { | ||
417 | x = 0 ; | ||
418 | } | ||
419 | else { | ||
420 | x = (u_long) - ((long)x) ; | ||
421 | } | ||
422 | } | ||
423 | if (x < mn) | ||
424 | return(mn) ; | ||
425 | else if (x > mx) | ||
426 | return(mx) ; | ||
427 | return(x) ; | ||
428 | } | ||
429 | |||
430 | #if 0 | ||
431 | struct s_smc SMC ; | ||
432 | main() | ||
433 | { | ||
434 | char *p ; | ||
435 | char *v ; | ||
436 | char buf[100] ; | ||
437 | int toggle = 0 ; | ||
438 | |||
439 | while (gets(buf)) { | ||
440 | p = buf ; | ||
441 | while (*p && ((*p == ' ') || (*p == '\t'))) | ||
442 | p++ ; | ||
443 | |||
444 | while (*p && ((*p != ' ') && (*p != '\t'))) | ||
445 | p++ ; | ||
446 | |||
447 | v = p ; | ||
448 | while (*v && ((*v == ' ') || (*v == '\t'))) | ||
449 | v++ ; | ||
450 | if ((*v >= '0') && (*v <= '9')) { | ||
451 | toggle = !toggle ; | ||
452 | if (toggle) { | ||
453 | u_long l ; | ||
454 | l = atol(v) ; | ||
455 | smt_parse_arg(&SMC,buf,0,(char _far *)&l) ; | ||
456 | } | ||
457 | else | ||
458 | smt_parse_arg(&SMC,buf,1,(char _far *)p) ; | ||
459 | } | ||
460 | else { | ||
461 | smt_parse_arg(&SMC,buf,1,(char _far *)p) ; | ||
462 | } | ||
463 | } | ||
464 | exit(0) ; | ||
465 | } | ||
466 | #endif | ||
467 | |||
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index fd80048f7f7a..cfb9d3cdb04a 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
@@ -315,15 +315,25 @@ static void smc_reset(struct net_device *dev) | |||
315 | struct smc_local *lp = netdev_priv(dev); | 315 | struct smc_local *lp = netdev_priv(dev); |
316 | void __iomem *ioaddr = lp->base; | 316 | void __iomem *ioaddr = lp->base; |
317 | unsigned int ctl, cfg; | 317 | unsigned int ctl, cfg; |
318 | struct sk_buff *pending_skb; | ||
318 | 319 | ||
319 | DBG(2, "%s: %s\n", dev->name, __FUNCTION__); | 320 | DBG(2, "%s: %s\n", dev->name, __FUNCTION__); |
320 | 321 | ||
321 | /* Disable all interrupts */ | 322 | /* Disable all interrupts, block TX tasklet */ |
322 | spin_lock(&lp->lock); | 323 | spin_lock(&lp->lock); |
323 | SMC_SELECT_BANK(2); | 324 | SMC_SELECT_BANK(2); |
324 | SMC_SET_INT_MASK(0); | 325 | SMC_SET_INT_MASK(0); |
326 | pending_skb = lp->pending_tx_skb; | ||
327 | lp->pending_tx_skb = NULL; | ||
325 | spin_unlock(&lp->lock); | 328 | spin_unlock(&lp->lock); |
326 | 329 | ||
330 | /* free any pending tx skb */ | ||
331 | if (pending_skb) { | ||
332 | dev_kfree_skb(pending_skb); | ||
333 | lp->stats.tx_errors++; | ||
334 | lp->stats.tx_aborted_errors++; | ||
335 | } | ||
336 | |||
327 | /* | 337 | /* |
328 | * This resets the registers mostly to defaults, but doesn't | 338 | * This resets the registers mostly to defaults, but doesn't |
329 | * affect EEPROM. That seems unnecessary | 339 | * affect EEPROM. That seems unnecessary |
@@ -389,14 +399,6 @@ static void smc_reset(struct net_device *dev) | |||
389 | SMC_SELECT_BANK(2); | 399 | SMC_SELECT_BANK(2); |
390 | SMC_SET_MMU_CMD(MC_RESET); | 400 | SMC_SET_MMU_CMD(MC_RESET); |
391 | SMC_WAIT_MMU_BUSY(); | 401 | SMC_WAIT_MMU_BUSY(); |
392 | |||
393 | /* clear anything saved */ | ||
394 | if (lp->pending_tx_skb != NULL) { | ||
395 | dev_kfree_skb (lp->pending_tx_skb); | ||
396 | lp->pending_tx_skb = NULL; | ||
397 | lp->stats.tx_errors++; | ||
398 | lp->stats.tx_aborted_errors++; | ||
399 | } | ||
400 | } | 402 | } |
401 | 403 | ||
402 | /* | 404 | /* |
@@ -440,6 +442,7 @@ static void smc_shutdown(struct net_device *dev) | |||
440 | { | 442 | { |
441 | struct smc_local *lp = netdev_priv(dev); | 443 | struct smc_local *lp = netdev_priv(dev); |
442 | void __iomem *ioaddr = lp->base; | 444 | void __iomem *ioaddr = lp->base; |
445 | struct sk_buff *pending_skb; | ||
443 | 446 | ||
444 | DBG(2, "%s: %s\n", CARDNAME, __FUNCTION__); | 447 | DBG(2, "%s: %s\n", CARDNAME, __FUNCTION__); |
445 | 448 | ||
@@ -447,7 +450,11 @@ static void smc_shutdown(struct net_device *dev) | |||
447 | spin_lock(&lp->lock); | 450 | spin_lock(&lp->lock); |
448 | SMC_SELECT_BANK(2); | 451 | SMC_SELECT_BANK(2); |
449 | SMC_SET_INT_MASK(0); | 452 | SMC_SET_INT_MASK(0); |
453 | pending_skb = lp->pending_tx_skb; | ||
454 | lp->pending_tx_skb = NULL; | ||
450 | spin_unlock(&lp->lock); | 455 | spin_unlock(&lp->lock); |
456 | if (pending_skb) | ||
457 | dev_kfree_skb(pending_skb); | ||
451 | 458 | ||
452 | /* and tell the card to stay away from that nasty outside world */ | 459 | /* and tell the card to stay away from that nasty outside world */ |
453 | SMC_SELECT_BANK(0); | 460 | SMC_SELECT_BANK(0); |
@@ -627,7 +634,12 @@ static void smc_hardware_send_pkt(unsigned long data) | |||
627 | } | 634 | } |
628 | 635 | ||
629 | skb = lp->pending_tx_skb; | 636 | skb = lp->pending_tx_skb; |
637 | if (unlikely(!skb)) { | ||
638 | smc_special_unlock(&lp->lock); | ||
639 | return; | ||
640 | } | ||
630 | lp->pending_tx_skb = NULL; | 641 | lp->pending_tx_skb = NULL; |
642 | |||
631 | packet_no = SMC_GET_AR(); | 643 | packet_no = SMC_GET_AR(); |
632 | if (unlikely(packet_no & AR_FAILED)) { | 644 | if (unlikely(packet_no & AR_FAILED)) { |
633 | printk("%s: Memory allocation failed.\n", dev->name); | 645 | printk("%s: Memory allocation failed.\n", dev->name); |
@@ -702,7 +714,6 @@ static int smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
702 | DBG(3, "%s: %s\n", dev->name, __FUNCTION__); | 714 | DBG(3, "%s: %s\n", dev->name, __FUNCTION__); |
703 | 715 | ||
704 | BUG_ON(lp->pending_tx_skb != NULL); | 716 | BUG_ON(lp->pending_tx_skb != NULL); |
705 | lp->pending_tx_skb = skb; | ||
706 | 717 | ||
707 | /* | 718 | /* |
708 | * The MMU wants the number of pages to be the number of 256 bytes | 719 | * The MMU wants the number of pages to be the number of 256 bytes |
@@ -718,7 +729,6 @@ static int smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
718 | numPages = ((skb->len & ~1) + (6 - 1)) >> 8; | 729 | numPages = ((skb->len & ~1) + (6 - 1)) >> 8; |
719 | if (unlikely(numPages > 7)) { | 730 | if (unlikely(numPages > 7)) { |
720 | printk("%s: Far too big packet error.\n", dev->name); | 731 | printk("%s: Far too big packet error.\n", dev->name); |
721 | lp->pending_tx_skb = NULL; | ||
722 | lp->stats.tx_errors++; | 732 | lp->stats.tx_errors++; |
723 | lp->stats.tx_dropped++; | 733 | lp->stats.tx_dropped++; |
724 | dev_kfree_skb(skb); | 734 | dev_kfree_skb(skb); |
@@ -745,6 +755,7 @@ static int smc_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
745 | 755 | ||
746 | smc_special_unlock(&lp->lock); | 756 | smc_special_unlock(&lp->lock); |
747 | 757 | ||
758 | lp->pending_tx_skb = skb; | ||
748 | if (!poll_count) { | 759 | if (!poll_count) { |
749 | /* oh well, wait until the chip finds memory later */ | 760 | /* oh well, wait until the chip finds memory later */ |
750 | netif_stop_queue(dev); | 761 | netif_stop_queue(dev); |
@@ -1062,7 +1073,7 @@ static void smc_phy_powerdown(struct net_device *dev) | |||
1062 | above). linkwatch_event() also wants the netlink semaphore. | 1073 | above). linkwatch_event() also wants the netlink semaphore. |
1063 | */ | 1074 | */ |
1064 | while(lp->work_pending) | 1075 | while(lp->work_pending) |
1065 | schedule(); | 1076 | yield(); |
1066 | 1077 | ||
1067 | bmcr = smc_phy_read(dev, phy, MII_BMCR); | 1078 | bmcr = smc_phy_read(dev, phy, MII_BMCR); |
1068 | smc_phy_write(dev, phy, MII_BMCR, bmcr | BMCR_PDOWN); | 1079 | smc_phy_write(dev, phy, MII_BMCR, bmcr | BMCR_PDOWN); |
@@ -1606,14 +1617,8 @@ static int smc_close(struct net_device *dev) | |||
1606 | 1617 | ||
1607 | /* clear everything */ | 1618 | /* clear everything */ |
1608 | smc_shutdown(dev); | 1619 | smc_shutdown(dev); |
1609 | 1620 | tasklet_kill(&lp->tx_task); | |
1610 | smc_phy_powerdown(dev); | 1621 | smc_phy_powerdown(dev); |
1611 | |||
1612 | if (lp->pending_tx_skb) { | ||
1613 | dev_kfree_skb(lp->pending_tx_skb); | ||
1614 | lp->pending_tx_skb = NULL; | ||
1615 | } | ||
1616 | |||
1617 | return 0; | 1622 | return 0; |
1618 | } | 1623 | } |
1619 | 1624 | ||
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index 6e5ade99a38f..97712c3c4e07 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
@@ -455,8 +455,7 @@ static int streamer_reset(struct net_device *dev) | |||
455 | writew(readw(streamer_mmio + BCTL) | BCTL_SOFTRESET, streamer_mmio + BCTL); | 455 | writew(readw(streamer_mmio + BCTL) | BCTL_SOFTRESET, streamer_mmio + BCTL); |
456 | t = jiffies; | 456 | t = jiffies; |
457 | /* Hold soft reset bit for a while */ | 457 | /* Hold soft reset bit for a while */ |
458 | current->state = TASK_UNINTERRUPTIBLE; | 458 | ssleep(1); |
459 | schedule_timeout(HZ); | ||
460 | 459 | ||
461 | writew(readw(streamer_mmio + BCTL) & ~BCTL_SOFTRESET, | 460 | writew(readw(streamer_mmio + BCTL) & ~BCTL_SOFTRESET, |
462 | streamer_mmio + BCTL); | 461 | streamer_mmio + BCTL); |
@@ -512,8 +511,7 @@ static int streamer_reset(struct net_device *dev) | |||
512 | writew(SISR_MI, streamer_mmio + SISR_MASK_SUM); | 511 | writew(SISR_MI, streamer_mmio + SISR_MASK_SUM); |
513 | 512 | ||
514 | while (!((readw(streamer_mmio + SISR)) & SISR_SRB_REPLY)) { | 513 | while (!((readw(streamer_mmio + SISR)) & SISR_SRB_REPLY)) { |
515 | current->state = TASK_INTERRUPTIBLE; | 514 | msleep_interruptible(100); |
516 | schedule_timeout(HZ/10); | ||
517 | if (jiffies - t > 40 * HZ) { | 515 | if (jiffies - t > 40 * HZ) { |
518 | printk(KERN_ERR | 516 | printk(KERN_ERR |
519 | "IBM PCI tokenring card not responding\n"); | 517 | "IBM PCI tokenring card not responding\n"); |
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index cfc346e72d62..08e0f80f89d5 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c | |||
@@ -242,6 +242,7 @@ static struct pci_device_id tulip_pci_tbl[] = { | |||
242 | { 0x10b9, 0x5261, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ULI526X }, /* ALi 1563 integrated ethernet */ | 242 | { 0x10b9, 0x5261, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ULI526X }, /* ALi 1563 integrated ethernet */ |
243 | { 0x10b9, 0x5263, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ULI526X }, /* ALi 1563 integrated ethernet */ | 243 | { 0x10b9, 0x5263, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ULI526X }, /* ALi 1563 integrated ethernet */ |
244 | { 0x10b7, 0x9300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* 3Com 3CSOHO100B-TX */ | 244 | { 0x10b7, 0x9300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* 3Com 3CSOHO100B-TX */ |
245 | { 0x14ea, 0xab08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* Planex FNW-3602-TX */ | ||
245 | { } /* terminate list */ | 246 | { } /* terminate list */ |
246 | }; | 247 | }; |
247 | MODULE_DEVICE_TABLE(pci, tulip_pci_tbl); | 248 | MODULE_DEVICE_TABLE(pci, tulip_pci_tbl); |
@@ -1756,11 +1757,19 @@ static int tulip_suspend (struct pci_dev *pdev, pm_message_t state) | |||
1756 | { | 1757 | { |
1757 | struct net_device *dev = pci_get_drvdata(pdev); | 1758 | struct net_device *dev = pci_get_drvdata(pdev); |
1758 | 1759 | ||
1759 | if (dev && netif_running (dev) && netif_device_present (dev)) { | 1760 | if (!dev) |
1760 | netif_device_detach (dev); | 1761 | return -EINVAL; |
1761 | tulip_down (dev); | 1762 | |
1762 | /* pci_power_off(pdev, -1); */ | 1763 | if (netif_running(dev)) |
1763 | } | 1764 | tulip_down(dev); |
1765 | |||
1766 | netif_device_detach(dev); | ||
1767 | free_irq(dev->irq, dev); | ||
1768 | |||
1769 | pci_save_state(pdev); | ||
1770 | pci_disable_device(pdev); | ||
1771 | pci_set_power_state(pdev, pci_choose_state(pdev, state)); | ||
1772 | |||
1764 | return 0; | 1773 | return 0; |
1765 | } | 1774 | } |
1766 | 1775 | ||
@@ -1768,15 +1777,26 @@ static int tulip_suspend (struct pci_dev *pdev, pm_message_t state) | |||
1768 | static int tulip_resume(struct pci_dev *pdev) | 1777 | static int tulip_resume(struct pci_dev *pdev) |
1769 | { | 1778 | { |
1770 | struct net_device *dev = pci_get_drvdata(pdev); | 1779 | struct net_device *dev = pci_get_drvdata(pdev); |
1780 | int retval; | ||
1771 | 1781 | ||
1772 | if (dev && netif_running (dev) && !netif_device_present (dev)) { | 1782 | if (!dev) |
1773 | #if 1 | 1783 | return -EINVAL; |
1774 | pci_enable_device (pdev); | 1784 | |
1775 | #endif | 1785 | pci_set_power_state(pdev, PCI_D0); |
1776 | /* pci_power_on(pdev); */ | 1786 | pci_restore_state(pdev); |
1777 | tulip_up (dev); | 1787 | |
1778 | netif_device_attach (dev); | 1788 | pci_enable_device(pdev); |
1789 | |||
1790 | if ((retval = request_irq(dev->irq, &tulip_interrupt, SA_SHIRQ, dev->name, dev))) { | ||
1791 | printk (KERN_ERR "tulip: request_irq failed in resume\n"); | ||
1792 | return retval; | ||
1779 | } | 1793 | } |
1794 | |||
1795 | netif_device_attach(dev); | ||
1796 | |||
1797 | if (netif_running(dev)) | ||
1798 | tulip_up(dev); | ||
1799 | |||
1780 | return 0; | 1800 | return 0; |
1781 | } | 1801 | } |
1782 | 1802 | ||
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index 6200cfc4244e..be1c1047b9ba 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c | |||
@@ -1398,7 +1398,7 @@ static void rhine_tx(struct net_device *dev) | |||
1398 | while (rp->dirty_tx != rp->cur_tx) { | 1398 | while (rp->dirty_tx != rp->cur_tx) { |
1399 | txstatus = le32_to_cpu(rp->tx_ring[entry].tx_status); | 1399 | txstatus = le32_to_cpu(rp->tx_ring[entry].tx_status); |
1400 | if (debug > 6) | 1400 | if (debug > 6) |
1401 | printk(KERN_DEBUG " Tx scavenge %d status %8.8x.\n", | 1401 | printk(KERN_DEBUG "Tx scavenge %d status %8.8x.\n", |
1402 | entry, txstatus); | 1402 | entry, txstatus); |
1403 | if (txstatus & DescOwn) | 1403 | if (txstatus & DescOwn) |
1404 | break; | 1404 | break; |
@@ -1469,7 +1469,7 @@ static void rhine_rx(struct net_device *dev) | |||
1469 | int data_size = desc_status >> 16; | 1469 | int data_size = desc_status >> 16; |
1470 | 1470 | ||
1471 | if (debug > 4) | 1471 | if (debug > 4) |
1472 | printk(KERN_DEBUG " rhine_rx() status is %8.8x.\n", | 1472 | printk(KERN_DEBUG "rhine_rx() status is %8.8x.\n", |
1473 | desc_status); | 1473 | desc_status); |
1474 | if (--boguscnt < 0) | 1474 | if (--boguscnt < 0) |
1475 | break; | 1475 | break; |
@@ -1487,7 +1487,7 @@ static void rhine_rx(struct net_device *dev) | |||
1487 | } else if (desc_status & RxErr) { | 1487 | } else if (desc_status & RxErr) { |
1488 | /* There was a error. */ | 1488 | /* There was a error. */ |
1489 | if (debug > 2) | 1489 | if (debug > 2) |
1490 | printk(KERN_DEBUG " rhine_rx() Rx " | 1490 | printk(KERN_DEBUG "rhine_rx() Rx " |
1491 | "error was %8.8x.\n", | 1491 | "error was %8.8x.\n", |
1492 | desc_status); | 1492 | desc_status); |
1493 | rp->stats.rx_errors++; | 1493 | rp->stats.rx_errors++; |
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index 7575b799ce53..7217d44e8854 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c | |||
@@ -981,6 +981,7 @@ fst_issue_cmd(struct fst_port_info *port, unsigned short cmd) | |||
981 | /* Wait for any previous command to complete */ | 981 | /* Wait for any previous command to complete */ |
982 | while (mbval > NAK) { | 982 | while (mbval > NAK) { |
983 | spin_unlock_irqrestore(&card->card_lock, flags); | 983 | spin_unlock_irqrestore(&card->card_lock, flags); |
984 | set_current_state(TASK_UNINTERRUPTIBLE); | ||
984 | schedule_timeout(1); | 985 | schedule_timeout(1); |
985 | spin_lock_irqsave(&card->card_lock, flags); | 986 | spin_lock_irqsave(&card->card_lock, flags); |
986 | 987 | ||
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 180968899cad..c12648d8192b 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -900,7 +900,7 @@ typedef struct aironet_ioctl { | |||
900 | unsigned char __user *data; // d-data | 900 | unsigned char __user *data; // d-data |
901 | } aironet_ioctl; | 901 | } aironet_ioctl; |
902 | 902 | ||
903 | static char *swversion = "2.1"; | 903 | static char swversion[] = "2.1"; |
904 | #endif /* CISCO_EXT */ | 904 | #endif /* CISCO_EXT */ |
905 | 905 | ||
906 | #define NUM_MODULES 2 | 906 | #define NUM_MODULES 2 |
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index b1078baa1d5e..aabcdc2be05e 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c | |||
@@ -46,382 +46,9 @@ | |||
46 | * under either the MPL or the GPL. */ | 46 | * under either the MPL or the GPL. */ |
47 | 47 | ||
48 | /* | 48 | /* |
49 | * v0.01 -> v0.02 - 21/3/2001 - Jean II | ||
50 | * o Allow to use regular ethX device name instead of dldwdX | ||
51 | * o Warning on IBSS with ESSID=any for firmware 6.06 | ||
52 | * o Put proper range.throughput values (optimistic) | ||
53 | * o IWSPY support (IOCTL and stat gather in Rx path) | ||
54 | * o Allow setting frequency in Ad-Hoc mode | ||
55 | * o Disable WEP setting if !has_wep to work on old firmware | ||
56 | * o Fix txpower range | ||
57 | * o Start adding support for Samsung/Compaq firmware | ||
58 | * | ||
59 | * v0.02 -> v0.03 - 23/3/2001 - Jean II | ||
60 | * o Start adding Symbol support - need to check all that | ||
61 | * o Fix Prism2/Symbol WEP to accept 128 bits keys | ||
62 | * o Add Symbol WEP (add authentication type) | ||
63 | * o Add Prism2/Symbol rate | ||
64 | * o Add PM timeout (holdover duration) | ||
65 | * o Enable "iwconfig eth0 key off" and friends (toggle flags) | ||
66 | * o Enable "iwconfig eth0 power unicast/all" (toggle flags) | ||
67 | * o Try with an Intel card. It report firmware 1.01, behave like | ||
68 | * an antiquated firmware, however on windows it says 2.00. Yuck ! | ||
69 | * o Workaround firmware bug in allocate buffer (Intel 1.01) | ||
70 | * o Finish external renaming to orinoco... | ||
71 | * o Testing with various Wavelan firmwares | ||
72 | * | ||
73 | * v0.03 -> v0.04 - 30/3/2001 - Jean II | ||
74 | * o Update to Wireless 11 -> add retry limit/lifetime support | ||
75 | * o Tested with a D-Link DWL 650 card, fill in firmware support | ||
76 | * o Warning on Vcc mismatch (D-Link 3.3v card in Lucent 5v only slot) | ||
77 | * o Fixed the Prism2 WEP bugs that I introduced in v0.03 :-( | ||
78 | * It works on D-Link *only* after a tcpdump. Weird... | ||
79 | * And still doesn't work on Intel card. Grrrr... | ||
80 | * o Update the mode after a setport3 | ||
81 | * o Add preamble setting for Symbol cards (not yet enabled) | ||
82 | * o Don't complain as much about Symbol cards... | ||
83 | * | ||
84 | * v0.04 -> v0.04b - 22/4/2001 - David Gibson | ||
85 | * o Removed the 'eth' parameter - always use ethXX as the | ||
86 | * interface name instead of dldwdXX. The other was racy | ||
87 | * anyway. | ||
88 | * o Clean up RID definitions in hermes.h, other cleanups | ||
89 | * | ||
90 | * v0.04b -> v0.04c - 24/4/2001 - Jean II | ||
91 | * o Tim Hurley <timster AT seiki.bliztech.com> reported a D-Link card | ||
92 | * with vendor 02 and firmware 0.08. Added in the capabilities... | ||
93 | * o Tested Lucent firmware 7.28, everything works... | ||
94 | * | ||
95 | * v0.04c -> v0.05 - 3/5/2001 - Benjamin Herrenschmidt | ||
96 | * o Spin-off Pcmcia code. This file is renamed orinoco.c, | ||
97 | * and orinoco_cs.c now contains only the Pcmcia specific stuff | ||
98 | * o Add Airport driver support on top of orinoco.c (see airport.c) | ||
99 | * | ||
100 | * v0.05 -> v0.05a - 4/5/2001 - Jean II | ||
101 | * o Revert to old Pcmcia code to fix breakage of Ben's changes... | ||
102 | * | ||
103 | * v0.05a -> v0.05b - 4/5/2001 - Jean II | ||
104 | * o add module parameter 'ignore_cis_vcc' for D-Link @ 5V | ||
105 | * o D-Link firmware doesn't support multicast. We just print a few | ||
106 | * error messages, but otherwise everything works... | ||
107 | * o For David : set/getport3 works fine, just upgrade iwpriv... | ||
108 | * | ||
109 | * v0.05b -> v0.05c - 5/5/2001 - Benjamin Herrenschmidt | ||
110 | * o Adapt airport.c to latest changes in orinoco.c | ||
111 | * o Remove deferred power enabling code | ||
112 | * | ||
113 | * v0.05c -> v0.05d - 5/5/2001 - Jean II | ||
114 | * o Workaround to SNAP decapsulate frame from Linksys AP | ||
115 | * original patch from : Dong Liu <dliu AT research.bell-labs.com> | ||
116 | * (note : the memcmp bug was mine - fixed) | ||
117 | * o Remove set_retry stuff, no firmware support it (bloat--). | ||
118 | * | ||
119 | * v0.05d -> v0.06 - 25/5/2001 - Jean II | ||
120 | * Original patch from "Hong Lin" <alin AT redhat.com>, | ||
121 | * "Ian Kinner" <ikinner AT redhat.com> | ||
122 | * and "David Smith" <dsmith AT redhat.com> | ||
123 | * o Init of priv->tx_rate_ctrl in firmware specific section. | ||
124 | * o Prism2/Symbol rate, upto should be 0xF and not 0x15. Doh ! | ||
125 | * o Spectrum card always need cor_reset (for every reset) | ||
126 | * o Fix cor_reset to not lose bit 7 in the register | ||
127 | * o flush_stale_links to remove zombie Pcmcia instances | ||
128 | * o Ack previous hermes event before reset | ||
129 | * Me (with my little hands) | ||
130 | * o Allow orinoco.c to call cor_reset via priv->card_reset_handler | ||
131 | * o Add priv->need_card_reset to toggle this feature | ||
132 | * o Fix various buglets when setting WEP in Symbol firmware | ||
133 | * Now, encryption is fully functional on Symbol cards. Youpi ! | ||
134 | * | ||
135 | * v0.06 -> v0.06b - 25/5/2001 - Jean II | ||
136 | * o IBSS on Symbol use port_mode = 4. Please don't ask... | ||
137 | * | ||
138 | * v0.06b -> v0.06c - 29/5/2001 - Jean II | ||
139 | * o Show first spy address in /proc/net/wireless for IBSS mode as well | ||
140 | * | ||
141 | * v0.06c -> v0.06d - 6/7/2001 - David Gibson | ||
142 | * o Change a bunch of KERN_INFO messages to KERN_DEBUG, as per Linus' | ||
143 | * wishes to reduce the number of unnecessary messages. | ||
144 | * o Removed bogus message on CRC error. | ||
145 | * o Merged fixes for v0.08 Prism 2 firmware from William Waghorn | ||
146 | * <willwaghorn AT yahoo.co.uk> | ||
147 | * o Slight cleanup/re-arrangement of firmware detection code. | ||
148 | * | ||
149 | * v0.06d -> v0.06e - 1/8/2001 - David Gibson | ||
150 | * o Removed some redundant global initializers (orinoco_cs.c). | ||
151 | * o Added some module metadata | ||
152 | * | ||
153 | * v0.06e -> v0.06f - 14/8/2001 - David Gibson | ||
154 | * o Wording fix to license | ||
155 | * o Added a 'use_alternate_encaps' module parameter for APs which need an | ||
156 | * oui of 00:00:00. We really need a better way of handling this, but | ||
157 | * the module flag is better than nothing for now. | ||
158 | * | ||
159 | * v0.06f -> v0.07 - 20/8/2001 - David Gibson | ||
160 | * o Removed BAP error retries from hermes_bap_seek(). For Tx we now | ||
161 | * let the upper layers handle the retry, we retry explicitly in the | ||
162 | * Rx path, but don't make as much noise about it. | ||
163 | * o Firmware detection cleanups. | ||
164 | * | ||
165 | * v0.07 -> v0.07a - 1/10/3001 - Jean II | ||
166 | * o Add code to read Symbol firmware revision, inspired by latest code | ||
167 | * in Spectrum24 by Lee John Keyser-Allen - Thanks Lee ! | ||
168 | * o Thanks to Jared Valentine <hidden AT xmission.com> for "providing" me | ||
169 | * a 3Com card with a recent firmware, fill out Symbol firmware | ||
170 | * capabilities of latest rev (2.20), as well as older Symbol cards. | ||
171 | * o Disable Power Management in newer Symbol firmware, the API | ||
172 | * has changed (documentation needed). | ||
173 | * | ||
174 | * v0.07a -> v0.08 - 3/10/2001 - David Gibson | ||
175 | * o Fixed a possible buffer overrun found by the Stanford checker (in | ||
176 | * dldwd_ioctl_setiwencode()). Can only be called by root anyway, so not | ||
177 | * a big problem. | ||
178 | * o Turned has_big_wep on for Intersil cards. That's not true for all of | ||
179 | * them but we should at least let the capable ones try. | ||
180 | * o Wait for BUSY to clear at the beginning of hermes_bap_seek(). I | ||
181 | * realized that my assumption that the driver's serialization | ||
182 | * would prevent the BAP being busy on entry was possibly false, because | ||
183 | * things other than seeks may make the BAP busy. | ||
184 | * o Use "alternate" (oui 00:00:00) encapsulation by default. | ||
185 | * Setting use_old_encaps will mimic the old behaviour, but I think we | ||
186 | * will be able to eliminate this. | ||
187 | * o Don't try to make __initdata const (the version string). This can't | ||
188 | * work because of the way the __initdata sectioning works. | ||
189 | * o Added MODULE_LICENSE tags. | ||
190 | * o Support for PLX (transparent PCMCIA->PCI bridge) cards. | ||
191 | * o Changed to using the new type-fascist min/max. | ||
192 | * | ||
193 | * v0.08 -> v0.08a - 9/10/2001 - David Gibson | ||
194 | * o Inserted some missing acknowledgements/info into the Changelog. | ||
195 | * o Fixed some bugs in the normalization of signal level reporting. | ||
196 | * o Fixed bad bug in WEP key handling on Intersil and Symbol firmware, | ||
197 | * which led to an instant crash on big-endian machines. | ||
198 | * | ||
199 | * v0.08a -> v0.08b - 20/11/2001 - David Gibson | ||
200 | * o Lots of cleanup and bugfixes in orinoco_plx.c | ||
201 | * o Cleanup to handling of Tx rate setting. | ||
202 | * o Removed support for old encapsulation method. | ||
203 | * o Removed old "dldwd" names. | ||
204 | * o Split RID constants into a new file hermes_rid.h | ||
205 | * o Renamed RID constants to match linux-wlan-ng and prism2.o | ||
206 | * o Bugfixes in hermes.c | ||
207 | * o Poke the PLX's INTCSR register, so it actually starts | ||
208 | * generating interrupts. These cards might actually work now. | ||
209 | * o Update to wireless extensions v12 (Jean II) | ||
210 | * o Support for tallies and inquire command (Jean II) | ||
211 | * o Airport updates for newer PPC kernels (BenH) | ||
212 | * | ||
213 | * v0.08b -> v0.09 - 21/12/2001 - David Gibson | ||
214 | * o Some new PCI IDs for PLX cards. | ||
215 | * o Removed broken attempt to do ALLMULTI reception. Just use | ||
216 | * promiscuous mode instead | ||
217 | * o Preliminary work for list-AP (Jean II) | ||
218 | * o Airport updates from (BenH) | ||
219 | * o Eliminated racy hw_ready stuff | ||
220 | * o Fixed generation of fake events in irq handler. This should | ||
221 | * finally kill the EIO problems (Jean II & dgibson) | ||
222 | * o Fixed breakage of bitrate set/get on Agere firmware (Jean II) | ||
223 | * | ||
224 | * v0.09 -> v0.09a - 2/1/2002 - David Gibson | ||
225 | * o Fixed stupid mistake in multicast list handling, triggering | ||
226 | * a BUG() | ||
227 | * | ||
228 | * v0.09a -> v0.09b - 16/1/2002 - David Gibson | ||
229 | * o Fixed even stupider mistake in new interrupt handling, which | ||
230 | * seriously broke things on big-endian machines. | ||
231 | * o Removed a bunch of redundant includes and exports. | ||
232 | * o Removed a redundant MOD_{INC,DEC}_USE_COUNT pair in airport.c | ||
233 | * o Don't attempt to do hardware level multicast reception on | ||
234 | * Intersil firmware, just go promisc instead. | ||
235 | * o Typo fixed in hermes_issue_cmd() | ||
236 | * o Eliminated WIRELESS_SPY #ifdefs | ||
237 | * o Status code reported on Tx exceptions | ||
238 | * o Moved netif_wake_queue() from ALLOC interrupts to TX and TXEXC | ||
239 | * interrupts, which should fix the timeouts we're seeing. | ||
240 | * | ||
241 | * v0.09b -> v0.10 - 25 Feb 2002 - David Gibson | ||
242 | * o Removed nested structures used for header parsing, so the | ||
243 | * driver should now work without hackery on ARM | ||
244 | * o Fix for WEP handling on Intersil (Hawk Newton) | ||
245 | * o Eliminated the /proc/hermes/ethXX/regs debugging file. It | ||
246 | * was never very useful. | ||
247 | * o Make Rx errors less noisy. | ||
248 | * | ||
249 | * v0.10 -> v0.11 - 5 Apr 2002 - David Gibson | ||
250 | * o Laid the groundwork in hermes.[ch] for devices which map | ||
251 | * into PCI memory space rather than IO space. | ||
252 | * o Fixed bug in multicast handling (cleared multicast list when | ||
253 | * leaving promiscuous mode). | ||
254 | * o Relegated Tx error messages to debug. | ||
255 | * o Cleaned up / corrected handling of allocation lengths. | ||
256 | * o Set OWNSSID in IBSS mode for WinXP interoperability (jimc). | ||
257 | * o Change to using alloc_etherdev() for structure allocations. | ||
258 | * o Check for and drop undersized packets. | ||
259 | * o Fixed a race in stopping/waking the queue. This should fix | ||
260 | * the timeout problems (Pavel Roskin) | ||
261 | * o Reverted to netif_wake_queue() on the ALLOC event. | ||
262 | * o Fixes for recent Symbol firmwares which lack AP density | ||
263 | * (Pavel Roskin). | ||
264 | * | ||
265 | * v0.11 -> v0.11a - 29 Apr 2002 - David Gibson | ||
266 | * o Handle different register spacing, necessary for Prism 2.5 | ||
267 | * PCI adaptors (Steve Hill). | ||
268 | * o Cleaned up initialization of card structures in orinoco_cs | ||
269 | * and airport. Removed card->priv field. | ||
270 | * o Make response structure optional for hermes_docmd_wait() | ||
271 | * Pavel Roskin) | ||
272 | * o Added PCI id for Nortel emobility to orinoco_plx.c. | ||
273 | * o Cleanup to handling of Symbol's allocation bug. (Pavel Roskin) | ||
274 | * o Cleanups to firmware capability detection. | ||
275 | * o Arrange for orinoco_pci.c to override firmware detection. | ||
276 | * We should be able to support the PCI Intersil cards now. | ||
277 | * o Cleanup handling of reset_cor and hard_reset (Pavel Roskin). | ||
278 | * o Remove erroneous use of USER_BAP in the TxExc handler (Jouni | ||
279 | * Malinen). | ||
280 | * o Makefile changes for better integration into David Hinds | ||
281 | * pcmcia-cs package. | ||
282 | * | ||
283 | * v0.11a -> v0.11b - 1 May 2002 - David Gibson | ||
284 | * o Better error reporting in orinoco_plx_init_one() | ||
285 | * o Fixed multiple bad kfree() bugs introduced by the | ||
286 | * alloc_orinocodev() changes. | ||
287 | * | ||
288 | * v0.11b -> v0.12 - 19 Jun 2002 - David Gibson | ||
289 | * o Support changing the MAC address. | ||
290 | * o Correct display of Intersil firmware revision numbers. | ||
291 | * o Entirely revised locking scheme. Should be both simpler and | ||
292 | * better. | ||
293 | * o Merged some common code in orinoco_plx, orinoco_pci and | ||
294 | * airport by creating orinoco_default_{open,stop,reset}() | ||
295 | * which are used as the dev->open, dev->stop, priv->reset | ||
296 | * callbacks if none are specified when alloc_orinocodev() is | ||
297 | * called. | ||
298 | * o Removed orinoco_plx_interrupt() and orinoco_pci_interrupt(). | ||
299 | * They didn't do anything. | ||
300 | * | ||
301 | * v0.12 -> v0.12a - 4 Jul 2002 - David Gibson | ||
302 | * o Some rearrangement of code. | ||
303 | * o Numerous fixups to locking and rest handling, particularly | ||
304 | * for PCMCIA. | ||
305 | * o This allows open and stop net_device methods to be in | ||
306 | * orinoco.c now, rather than in the init modules. | ||
307 | * o In orinoco_cs.c link->priv now points to the struct | ||
308 | * net_device not to the struct orinoco_private. | ||
309 | * o Added a check for undersized SNAP frames, which could cause | ||
310 | * crashes. | ||
311 | * | ||
312 | * v0.12a -> v0.12b - 11 Jul 2002 - David Gibson | ||
313 | * o Fix hw->num_init testing code, so num_init is actually | ||
314 | * incremented. | ||
315 | * o Fix very stupid bug in orinoco_cs which broke compile with | ||
316 | * CONFIG_SMP. | ||
317 | * o Squashed a warning. | ||
318 | * | ||
319 | * v0.12b -> v0.12c - 26 Jul 2002 - David Gibson | ||
320 | * o Change to C9X style designated initializers. | ||
321 | * o Add support for 3Com AirConnect PCI. | ||
322 | * o No longer ignore the hard_reset argument to | ||
323 | * alloc_orinocodev(). Oops. | ||
324 | * | ||
325 | * v0.12c -> v0.13beta1 - 13 Sep 2002 - David Gibson | ||
326 | * o Revert the broken 0.12* locking scheme and go to a new yet | ||
327 | * simpler scheme. | ||
328 | * o Do firmware resets only in orinoco_init() and when waking | ||
329 | * the card from hard sleep. | ||
330 | * | ||
331 | * v0.13beta1 -> v0.13 - 27 Sep 2002 - David Gibson | ||
332 | * o Re-introduced full resets (via schedule_task()) on Tx | ||
333 | * timeout. | ||
334 | * | ||
335 | * v0.13 -> v0.13a - 30 Sep 2002 - David Gibson | ||
336 | * o Minor cleanups to info frame handling. Add basic support | ||
337 | * for linkstatus info frames. | ||
338 | * o Include required kernel headers in orinoco.h, to avoid | ||
339 | * compile problems. | ||
340 | * | ||
341 | * v0.13a -> v0.13b - 10 Feb 2003 - David Gibson | ||
342 | * o Implemented hard reset for Airport cards | ||
343 | * o Experimental suspend/resume implementation for orinoco_pci | ||
344 | * o Abolished /proc debugging support, replaced with a debugging | ||
345 | * iwpriv. Now it's ugly and simple instead of ugly and complex. | ||
346 | * o Bugfix in hermes.c if the firmware returned a record length | ||
347 | * of 0, we could go clobbering memory. | ||
348 | * o Bugfix in orinoco_stop() - it used to fail if hw_unavailable | ||
349 | * was set, which was usually true on PCMCIA hot removes. | ||
350 | * o Track LINKSTATUS messages, silently drop Tx packets before | ||
351 | * we are connected (avoids confusing the firmware), and only | ||
352 | * give LINKSTATUS printk()s if the status has changed. | ||
353 | * | ||
354 | * v0.13b -> v0.13c - 11 Mar 2003 - David Gibson | ||
355 | * o Cleanup: use dev instead of priv in various places. | ||
356 | * o Bug fix: Don't ReleaseConfiguration on RESET_PHYSICAL event | ||
357 | * if we're in the middle of a (driver initiated) hard reset. | ||
358 | * o Bug fix: ETH_ZLEN is supposed to include the header | ||
359 | * (Dionysus Blazakis & Manish Karir) | ||
360 | * o Convert to using workqueues instead of taskqueues (and | ||
361 | * backwards compatibility macros for pre 2.5.41 kernels). | ||
362 | * o Drop redundant (I think...) MOD_{INC,DEC}_USE_COUNT in | ||
363 | * airport.c | ||
364 | * o New orinoco_tmd.c init module from Joerg Dorchain for | ||
365 | * TMD7160 based PCI to PCMCIA bridges (similar to | ||
366 | * orinoco_plx.c). | ||
367 | * | ||
368 | * v0.13c -> v0.13d - 22 Apr 2003 - David Gibson | ||
369 | * o Make hw_unavailable a counter, rather than just a flag, this | ||
370 | * is necessary to avoid some races (such as a card being | ||
371 | * removed in the middle of orinoco_reset(). | ||
372 | * o Restore Release/RequestConfiguration in the PCMCIA event handler | ||
373 | * when dealing with a driver initiated hard reset. This is | ||
374 | * necessary to prevent hangs due to a spurious interrupt while | ||
375 | * the reset is in progress. | ||
376 | * o Clear the 802.11 header when transmitting, even though we | ||
377 | * don't use it. This fixes a long standing bug on some | ||
378 | * firmwares, which seem to get confused if that isn't done. | ||
379 | * o Be less eager to de-encapsulate SNAP frames, only do so if | ||
380 | * the OUI is 00:00:00 or 00:00:f8, leave others alone. The old | ||
381 | * behaviour broke CDP (Cisco Discovery Protocol). | ||
382 | * o Use dev instead of priv for free_irq() as well as | ||
383 | * request_irq() (oops). | ||
384 | * o Attempt to reset rather than giving up if we get too many | ||
385 | * IRQs. | ||
386 | * o Changed semantics of __orinoco_down() so it can be called | ||
387 | * safely with hw_unavailable set. It also now clears the | ||
388 | * linkstatus (since we're going to have to reassociate). | ||
389 | * | ||
390 | * v0.13d -> v0.13e - 12 May 2003 - David Gibson | ||
391 | * o Support for post-2.5.68 return values from irq handler. | ||
392 | * o Fixed bug where underlength packets would be double counted | ||
393 | * in the rx_dropped statistics. | ||
394 | * o Provided a module parameter to suppress linkstatus messages. | ||
395 | * | ||
396 | * v0.13e -> v0.14alpha1 - 30 Sep 2003 - David Gibson | ||
397 | * o Replaced priv->connected logic with netif_carrier_on/off() | ||
398 | * calls. | ||
399 | * o Remove has_ibss_any and never set the CREATEIBSS RID when | ||
400 | * the ESSID is empty. Too many firmwares break if we do. | ||
401 | * o 2.6 merges: Replace pdev->slot_name with pci_name(), remove | ||
402 | * __devinitdata from PCI ID tables, use free_netdev(). | ||
403 | * o Enabled shared-key authentication for Agere firmware (from | ||
404 | * Robert J. Moore <Robert.J.Moore AT allanbank.com> | ||
405 | * o Move netif_wake_queue() (back) to the Tx completion from the | ||
406 | * ALLOC event. This seems to prevent/mitigate the rolling | ||
407 | * error -110 problems at least on some Intersil firmwares. | ||
408 | * Theoretically reduces performance, but I can't measure it. | ||
409 | * Patch from Andrew Tridgell <tridge AT samba.org> | ||
410 | * | ||
411 | * v0.14alpha1 -> v0.14alpha2 - 20 Oct 2003 - David Gibson | ||
412 | * o Correctly turn off shared-key authentication when requested | ||
413 | * (bugfix from Robert J. Moore). | ||
414 | * o Correct airport sleep interfaces for current 2.6 kernels. | ||
415 | * o Add code for key change without disabling/enabling the MAC | ||
416 | * port. This is supposed to allow 802.1x to work sanely, but | ||
417 | * doesn't seem to yet. | ||
418 | * | ||
419 | * TODO | 49 | * TODO |
420 | * o New wireless extensions API (patch from Moustafa | ||
421 | * Youssef, updated by Jim Carter and Pavel Roskin). | ||
422 | * o Handle de-encapsulation within network layer, provide 802.11 | 50 | * o Handle de-encapsulation within network layer, provide 802.11 |
423 | * headers (patch from Thomas 'Dent' Mirlacher) | 51 | * headers (patch from Thomas 'Dent' Mirlacher) |
424 | * o RF monitor mode support | ||
425 | * o Fix possible races in SPY handling. | 52 | * o Fix possible races in SPY handling. |
426 | * o Disconnect wireless extensions from fundamental configuration. | 53 | * o Disconnect wireless extensions from fundamental configuration. |
427 | * o (maybe) Software WEP support (patch from Stano Meduna). | 54 | * o (maybe) Software WEP support (patch from Stano Meduna). |
@@ -462,7 +89,10 @@ | |||
462 | #include <linux/netdevice.h> | 89 | #include <linux/netdevice.h> |
463 | #include <linux/if_arp.h> | 90 | #include <linux/if_arp.h> |
464 | #include <linux/etherdevice.h> | 91 | #include <linux/etherdevice.h> |
92 | #include <linux/ethtool.h> | ||
465 | #include <linux/wireless.h> | 93 | #include <linux/wireless.h> |
94 | #include <net/iw_handler.h> | ||
95 | #include <net/ieee80211.h> | ||
466 | 96 | ||
467 | #include <asm/uaccess.h> | 97 | #include <asm/uaccess.h> |
468 | #include <asm/io.h> | 98 | #include <asm/io.h> |
@@ -496,6 +126,10 @@ static int ignore_disconnect; /* = 0 */ | |||
496 | module_param(ignore_disconnect, int, 0644); | 126 | module_param(ignore_disconnect, int, 0644); |
497 | MODULE_PARM_DESC(ignore_disconnect, "Don't report lost link to the network layer"); | 127 | MODULE_PARM_DESC(ignore_disconnect, "Don't report lost link to the network layer"); |
498 | 128 | ||
129 | static int force_monitor; /* = 0 */ | ||
130 | module_param(force_monitor, int, 0644); | ||
131 | MODULE_PARM_DESC(force_monitor, "Allow monitor mode for all firmware versions"); | ||
132 | |||
499 | /********************************************************************/ | 133 | /********************************************************************/ |
500 | /* Compile time configuration and compatibility stuff */ | 134 | /* Compile time configuration and compatibility stuff */ |
501 | /********************************************************************/ | 135 | /********************************************************************/ |
@@ -511,6 +145,10 @@ MODULE_PARM_DESC(ignore_disconnect, "Don't report lost link to the network layer | |||
511 | /* Internal constants */ | 145 | /* Internal constants */ |
512 | /********************************************************************/ | 146 | /********************************************************************/ |
513 | 147 | ||
148 | /* 802.2 LLC/SNAP header used for Ethernet encapsulation over 802.11 */ | ||
149 | static const u8 encaps_hdr[] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00}; | ||
150 | #define ENCAPS_OVERHEAD (sizeof(encaps_hdr) + 2) | ||
151 | |||
514 | #define ORINOCO_MIN_MTU 256 | 152 | #define ORINOCO_MIN_MTU 256 |
515 | #define ORINOCO_MAX_MTU (IEEE802_11_DATA_LEN - ENCAPS_OVERHEAD) | 153 | #define ORINOCO_MAX_MTU (IEEE802_11_DATA_LEN - ENCAPS_OVERHEAD) |
516 | 154 | ||
@@ -537,6 +175,11 @@ MODULE_PARM_DESC(ignore_disconnect, "Don't report lost link to the network layer | |||
537 | | HERMES_EV_WTERR | HERMES_EV_INFO \ | 175 | | HERMES_EV_WTERR | HERMES_EV_INFO \ |
538 | | HERMES_EV_INFDROP ) | 176 | | HERMES_EV_INFDROP ) |
539 | 177 | ||
178 | #define MAX_RID_LEN 1024 | ||
179 | |||
180 | static const struct iw_handler_def orinoco_handler_def; | ||
181 | static struct ethtool_ops orinoco_ethtool_ops; | ||
182 | |||
540 | /********************************************************************/ | 183 | /********************************************************************/ |
541 | /* Data tables */ | 184 | /* Data tables */ |
542 | /********************************************************************/ | 185 | /********************************************************************/ |
@@ -571,26 +214,45 @@ static struct { | |||
571 | /* Data types */ | 214 | /* Data types */ |
572 | /********************************************************************/ | 215 | /********************************************************************/ |
573 | 216 | ||
574 | struct header_struct { | 217 | /* Used in Event handling. |
575 | /* 802.3 */ | 218 | * We avoid nested structres as they break on ARM -- Moustafa */ |
576 | u8 dest[ETH_ALEN]; | 219 | struct hermes_tx_descriptor_802_11 { |
577 | u8 src[ETH_ALEN]; | 220 | /* hermes_tx_descriptor */ |
578 | u16 len; | 221 | u16 status; |
579 | /* 802.2 */ | 222 | u16 reserved1; |
223 | u16 reserved2; | ||
224 | u32 sw_support; | ||
225 | u8 retry_count; | ||
226 | u8 tx_rate; | ||
227 | u16 tx_control; | ||
228 | |||
229 | /* ieee802_11_hdr */ | ||
230 | u16 frame_ctl; | ||
231 | u16 duration_id; | ||
232 | u8 addr1[ETH_ALEN]; | ||
233 | u8 addr2[ETH_ALEN]; | ||
234 | u8 addr3[ETH_ALEN]; | ||
235 | u16 seq_ctl; | ||
236 | u8 addr4[ETH_ALEN]; | ||
237 | u16 data_len; | ||
238 | |||
239 | /* ethhdr */ | ||
240 | unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ | ||
241 | unsigned char h_source[ETH_ALEN]; /* source ether addr */ | ||
242 | unsigned short h_proto; /* packet type ID field */ | ||
243 | |||
244 | /* p8022_hdr */ | ||
580 | u8 dsap; | 245 | u8 dsap; |
581 | u8 ssap; | 246 | u8 ssap; |
582 | u8 ctrl; | 247 | u8 ctrl; |
583 | /* SNAP */ | ||
584 | u8 oui[3]; | 248 | u8 oui[3]; |
249 | |||
585 | u16 ethertype; | 250 | u16 ethertype; |
586 | } __attribute__ ((packed)); | 251 | } __attribute__ ((packed)); |
587 | 252 | ||
588 | /* 802.2 LLC/SNAP header used for Ethernet encapsulation over 802.11 */ | 253 | /* Rx frame header except compatibility 802.3 header */ |
589 | u8 encaps_hdr[] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00}; | ||
590 | |||
591 | #define ENCAPS_OVERHEAD (sizeof(encaps_hdr) + 2) | ||
592 | |||
593 | struct hermes_rx_descriptor { | 254 | struct hermes_rx_descriptor { |
255 | /* Control */ | ||
594 | u16 status; | 256 | u16 status; |
595 | u32 time; | 257 | u32 time; |
596 | u8 silence; | 258 | u8 silence; |
@@ -598,13 +260,24 @@ struct hermes_rx_descriptor { | |||
598 | u8 rate; | 260 | u8 rate; |
599 | u8 rxflow; | 261 | u8 rxflow; |
600 | u32 reserved; | 262 | u32 reserved; |
263 | |||
264 | /* 802.11 header */ | ||
265 | u16 frame_ctl; | ||
266 | u16 duration_id; | ||
267 | u8 addr1[ETH_ALEN]; | ||
268 | u8 addr2[ETH_ALEN]; | ||
269 | u8 addr3[ETH_ALEN]; | ||
270 | u16 seq_ctl; | ||
271 | u8 addr4[ETH_ALEN]; | ||
272 | |||
273 | /* Data length */ | ||
274 | u16 data_len; | ||
601 | } __attribute__ ((packed)); | 275 | } __attribute__ ((packed)); |
602 | 276 | ||
603 | /********************************************************************/ | 277 | /********************************************************************/ |
604 | /* Function prototypes */ | 278 | /* Function prototypes */ |
605 | /********************************************************************/ | 279 | /********************************************************************/ |
606 | 280 | ||
607 | static int orinoco_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); | ||
608 | static int __orinoco_program_rids(struct net_device *dev); | 281 | static int __orinoco_program_rids(struct net_device *dev); |
609 | static void __orinoco_set_multicast_list(struct net_device *dev); | 282 | static void __orinoco_set_multicast_list(struct net_device *dev); |
610 | 283 | ||
@@ -628,6 +301,10 @@ static inline void set_port_type(struct orinoco_private *priv) | |||
628 | priv->createibss = 1; | 301 | priv->createibss = 1; |
629 | } | 302 | } |
630 | break; | 303 | break; |
304 | case IW_MODE_MONITOR: | ||
305 | priv->port_type = 3; | ||
306 | priv->createibss = 0; | ||
307 | break; | ||
631 | default: | 308 | default: |
632 | printk(KERN_ERR "%s: Invalid priv->iw_mode in set_port_type()\n", | 309 | printk(KERN_ERR "%s: Invalid priv->iw_mode in set_port_type()\n", |
633 | priv->ndev->name); | 310 | priv->ndev->name); |
@@ -814,7 +491,7 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev) | |||
814 | return 1; | 491 | return 1; |
815 | } | 492 | } |
816 | 493 | ||
817 | if (! netif_carrier_ok(dev)) { | 494 | if (! netif_carrier_ok(dev) || (priv->iw_mode == IW_MODE_MONITOR)) { |
818 | /* Oops, the firmware hasn't established a connection, | 495 | /* Oops, the firmware hasn't established a connection, |
819 | silently drop the packet (this seems to be the | 496 | silently drop the packet (this seems to be the |
820 | safest approach). */ | 497 | safest approach). */ |
@@ -951,26 +628,55 @@ static void __orinoco_ev_txexc(struct net_device *dev, hermes_t *hw) | |||
951 | struct orinoco_private *priv = netdev_priv(dev); | 628 | struct orinoco_private *priv = netdev_priv(dev); |
952 | struct net_device_stats *stats = &priv->stats; | 629 | struct net_device_stats *stats = &priv->stats; |
953 | u16 fid = hermes_read_regn(hw, TXCOMPLFID); | 630 | u16 fid = hermes_read_regn(hw, TXCOMPLFID); |
954 | struct hermes_tx_descriptor desc; | 631 | struct hermes_tx_descriptor_802_11 hdr; |
955 | int err = 0; | 632 | int err = 0; |
956 | 633 | ||
957 | if (fid == DUMMY_FID) | 634 | if (fid == DUMMY_FID) |
958 | return; /* Nothing's really happened */ | 635 | return; /* Nothing's really happened */ |
959 | 636 | ||
960 | err = hermes_bap_pread(hw, IRQ_BAP, &desc, sizeof(desc), fid, 0); | 637 | /* Read the frame header */ |
638 | err = hermes_bap_pread(hw, IRQ_BAP, &hdr, | ||
639 | sizeof(struct hermes_tx_descriptor) + | ||
640 | sizeof(struct ieee80211_hdr), | ||
641 | fid, 0); | ||
642 | |||
643 | hermes_write_regn(hw, TXCOMPLFID, DUMMY_FID); | ||
644 | stats->tx_errors++; | ||
645 | |||
961 | if (err) { | 646 | if (err) { |
962 | printk(KERN_WARNING "%s: Unable to read descriptor on Tx error " | 647 | printk(KERN_WARNING "%s: Unable to read descriptor on Tx error " |
963 | "(FID=%04X error %d)\n", | 648 | "(FID=%04X error %d)\n", |
964 | dev->name, fid, err); | 649 | dev->name, fid, err); |
965 | } else { | 650 | return; |
966 | DEBUG(1, "%s: Tx error, status %d\n", | ||
967 | dev->name, le16_to_cpu(desc.status)); | ||
968 | } | 651 | } |
969 | 652 | ||
970 | stats->tx_errors++; | 653 | DEBUG(1, "%s: Tx error, err %d (FID=%04X)\n", dev->name, |
654 | err, fid); | ||
655 | |||
656 | /* We produce a TXDROP event only for retry or lifetime | ||
657 | * exceeded, because that's the only status that really mean | ||
658 | * that this particular node went away. | ||
659 | * Other errors means that *we* screwed up. - Jean II */ | ||
660 | hdr.status = le16_to_cpu(hdr.status); | ||
661 | if (hdr.status & (HERMES_TXSTAT_RETRYERR | HERMES_TXSTAT_AGEDERR)) { | ||
662 | union iwreq_data wrqu; | ||
663 | |||
664 | /* Copy 802.11 dest address. | ||
665 | * We use the 802.11 header because the frame may | ||
666 | * not be 802.3 or may be mangled... | ||
667 | * In Ad-Hoc mode, it will be the node address. | ||
668 | * In managed mode, it will be most likely the AP addr | ||
669 | * User space will figure out how to convert it to | ||
670 | * whatever it needs (IP address or else). | ||
671 | * - Jean II */ | ||
672 | memcpy(wrqu.addr.sa_data, hdr.addr1, ETH_ALEN); | ||
673 | wrqu.addr.sa_family = ARPHRD_ETHER; | ||
674 | |||
675 | /* Send event to user space */ | ||
676 | wireless_send_event(dev, IWEVTXDROP, &wrqu, NULL); | ||
677 | } | ||
971 | 678 | ||
972 | netif_wake_queue(dev); | 679 | netif_wake_queue(dev); |
973 | hermes_write_regn(hw, TXCOMPLFID, DUMMY_FID); | ||
974 | } | 680 | } |
975 | 681 | ||
976 | static void orinoco_tx_timeout(struct net_device *dev) | 682 | static void orinoco_tx_timeout(struct net_device *dev) |
@@ -1047,18 +753,127 @@ static void orinoco_stat_gather(struct net_device *dev, | |||
1047 | } | 753 | } |
1048 | } | 754 | } |
1049 | 755 | ||
756 | /* | ||
757 | * orinoco_rx_monitor - handle received monitor frames. | ||
758 | * | ||
759 | * Arguments: | ||
760 | * dev network device | ||
761 | * rxfid received FID | ||
762 | * desc rx descriptor of the frame | ||
763 | * | ||
764 | * Call context: interrupt | ||
765 | */ | ||
766 | static void orinoco_rx_monitor(struct net_device *dev, u16 rxfid, | ||
767 | struct hermes_rx_descriptor *desc) | ||
768 | { | ||
769 | u32 hdrlen = 30; /* return full header by default */ | ||
770 | u32 datalen = 0; | ||
771 | u16 fc; | ||
772 | int err; | ||
773 | int len; | ||
774 | struct sk_buff *skb; | ||
775 | struct orinoco_private *priv = netdev_priv(dev); | ||
776 | struct net_device_stats *stats = &priv->stats; | ||
777 | hermes_t *hw = &priv->hw; | ||
778 | |||
779 | len = le16_to_cpu(desc->data_len); | ||
780 | |||
781 | /* Determine the size of the header and the data */ | ||
782 | fc = le16_to_cpu(desc->frame_ctl); | ||
783 | switch (fc & IEEE80211_FCTL_FTYPE) { | ||
784 | case IEEE80211_FTYPE_DATA: | ||
785 | if ((fc & IEEE80211_FCTL_TODS) | ||
786 | && (fc & IEEE80211_FCTL_FROMDS)) | ||
787 | hdrlen = 30; | ||
788 | else | ||
789 | hdrlen = 24; | ||
790 | datalen = len; | ||
791 | break; | ||
792 | case IEEE80211_FTYPE_MGMT: | ||
793 | hdrlen = 24; | ||
794 | datalen = len; | ||
795 | break; | ||
796 | case IEEE80211_FTYPE_CTL: | ||
797 | switch (fc & IEEE80211_FCTL_STYPE) { | ||
798 | case IEEE80211_STYPE_PSPOLL: | ||
799 | case IEEE80211_STYPE_RTS: | ||
800 | case IEEE80211_STYPE_CFEND: | ||
801 | case IEEE80211_STYPE_CFENDACK: | ||
802 | hdrlen = 16; | ||
803 | break; | ||
804 | case IEEE80211_STYPE_CTS: | ||
805 | case IEEE80211_STYPE_ACK: | ||
806 | hdrlen = 10; | ||
807 | break; | ||
808 | } | ||
809 | break; | ||
810 | default: | ||
811 | /* Unknown frame type */ | ||
812 | break; | ||
813 | } | ||
814 | |||
815 | /* sanity check the length */ | ||
816 | if (datalen > IEEE80211_DATA_LEN + 12) { | ||
817 | printk(KERN_DEBUG "%s: oversized monitor frame, " | ||
818 | "data length = %d\n", dev->name, datalen); | ||
819 | err = -EIO; | ||
820 | stats->rx_length_errors++; | ||
821 | goto update_stats; | ||
822 | } | ||
823 | |||
824 | skb = dev_alloc_skb(hdrlen + datalen); | ||
825 | if (!skb) { | ||
826 | printk(KERN_WARNING "%s: Cannot allocate skb for monitor frame\n", | ||
827 | dev->name); | ||
828 | err = -ENOMEM; | ||
829 | goto drop; | ||
830 | } | ||
831 | |||
832 | /* Copy the 802.11 header to the skb */ | ||
833 | memcpy(skb_put(skb, hdrlen), &(desc->frame_ctl), hdrlen); | ||
834 | skb->mac.raw = skb->data; | ||
835 | |||
836 | /* If any, copy the data from the card to the skb */ | ||
837 | if (datalen > 0) { | ||
838 | err = hermes_bap_pread(hw, IRQ_BAP, skb_put(skb, datalen), | ||
839 | ALIGN(datalen, 2), rxfid, | ||
840 | HERMES_802_2_OFFSET); | ||
841 | if (err) { | ||
842 | printk(KERN_ERR "%s: error %d reading monitor frame\n", | ||
843 | dev->name, err); | ||
844 | goto drop; | ||
845 | } | ||
846 | } | ||
847 | |||
848 | skb->dev = dev; | ||
849 | skb->ip_summed = CHECKSUM_NONE; | ||
850 | skb->pkt_type = PACKET_OTHERHOST; | ||
851 | skb->protocol = __constant_htons(ETH_P_802_2); | ||
852 | |||
853 | dev->last_rx = jiffies; | ||
854 | stats->rx_packets++; | ||
855 | stats->rx_bytes += skb->len; | ||
856 | |||
857 | netif_rx(skb); | ||
858 | return; | ||
859 | |||
860 | drop: | ||
861 | dev_kfree_skb_irq(skb); | ||
862 | update_stats: | ||
863 | stats->rx_errors++; | ||
864 | stats->rx_dropped++; | ||
865 | } | ||
866 | |||
1050 | static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw) | 867 | static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw) |
1051 | { | 868 | { |
1052 | struct orinoco_private *priv = netdev_priv(dev); | 869 | struct orinoco_private *priv = netdev_priv(dev); |
1053 | struct net_device_stats *stats = &priv->stats; | 870 | struct net_device_stats *stats = &priv->stats; |
1054 | struct iw_statistics *wstats = &priv->wstats; | 871 | struct iw_statistics *wstats = &priv->wstats; |
1055 | struct sk_buff *skb = NULL; | 872 | struct sk_buff *skb = NULL; |
1056 | u16 rxfid, status; | 873 | u16 rxfid, status, fc; |
1057 | int length, data_len, data_off; | 874 | int length; |
1058 | char *p; | ||
1059 | struct hermes_rx_descriptor desc; | 875 | struct hermes_rx_descriptor desc; |
1060 | struct header_struct hdr; | 876 | struct ethhdr *hdr; |
1061 | struct ethhdr *eh; | ||
1062 | int err; | 877 | int err; |
1063 | 878 | ||
1064 | rxfid = hermes_read_regn(hw, RXFID); | 879 | rxfid = hermes_read_regn(hw, RXFID); |
@@ -1068,53 +883,46 @@ static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw) | |||
1068 | if (err) { | 883 | if (err) { |
1069 | printk(KERN_ERR "%s: error %d reading Rx descriptor. " | 884 | printk(KERN_ERR "%s: error %d reading Rx descriptor. " |
1070 | "Frame dropped.\n", dev->name, err); | 885 | "Frame dropped.\n", dev->name, err); |
1071 | stats->rx_errors++; | 886 | goto update_stats; |
1072 | goto drop; | ||
1073 | } | 887 | } |
1074 | 888 | ||
1075 | status = le16_to_cpu(desc.status); | 889 | status = le16_to_cpu(desc.status); |
1076 | 890 | ||
1077 | if (status & HERMES_RXSTAT_ERR) { | 891 | if (status & HERMES_RXSTAT_BADCRC) { |
1078 | if (status & HERMES_RXSTAT_UNDECRYPTABLE) { | 892 | DEBUG(1, "%s: Bad CRC on Rx. Frame dropped.\n", |
1079 | wstats->discard.code++; | 893 | dev->name); |
1080 | DEBUG(1, "%s: Undecryptable frame on Rx. Frame dropped.\n", | 894 | stats->rx_crc_errors++; |
1081 | dev->name); | 895 | goto update_stats; |
1082 | } else { | ||
1083 | stats->rx_crc_errors++; | ||
1084 | DEBUG(1, "%s: Bad CRC on Rx. Frame dropped.\n", dev->name); | ||
1085 | } | ||
1086 | stats->rx_errors++; | ||
1087 | goto drop; | ||
1088 | } | 896 | } |
1089 | 897 | ||
1090 | /* For now we ignore the 802.11 header completely, assuming | 898 | /* Handle frames in monitor mode */ |
1091 | that the card's firmware has handled anything vital */ | 899 | if (priv->iw_mode == IW_MODE_MONITOR) { |
900 | orinoco_rx_monitor(dev, rxfid, &desc); | ||
901 | return; | ||
902 | } | ||
1092 | 903 | ||
1093 | err = hermes_bap_pread(hw, IRQ_BAP, &hdr, sizeof(hdr), | 904 | if (status & HERMES_RXSTAT_UNDECRYPTABLE) { |
1094 | rxfid, HERMES_802_3_OFFSET); | 905 | DEBUG(1, "%s: Undecryptable frame on Rx. Frame dropped.\n", |
1095 | if (err) { | 906 | dev->name); |
1096 | printk(KERN_ERR "%s: error %d reading frame header. " | 907 | wstats->discard.code++; |
1097 | "Frame dropped.\n", dev->name, err); | 908 | goto update_stats; |
1098 | stats->rx_errors++; | ||
1099 | goto drop; | ||
1100 | } | 909 | } |
1101 | 910 | ||
1102 | length = ntohs(hdr.len); | 911 | length = le16_to_cpu(desc.data_len); |
1103 | 912 | fc = le16_to_cpu(desc.frame_ctl); | |
913 | |||
1104 | /* Sanity checks */ | 914 | /* Sanity checks */ |
1105 | if (length < 3) { /* No for even an 802.2 LLC header */ | 915 | if (length < 3) { /* No for even an 802.2 LLC header */ |
1106 | /* At least on Symbol firmware with PCF we get quite a | 916 | /* At least on Symbol firmware with PCF we get quite a |
1107 | lot of these legitimately - Poll frames with no | 917 | lot of these legitimately - Poll frames with no |
1108 | data. */ | 918 | data. */ |
1109 | stats->rx_dropped++; | 919 | return; |
1110 | goto drop; | ||
1111 | } | 920 | } |
1112 | if (length > IEEE802_11_DATA_LEN) { | 921 | if (length > IEEE802_11_DATA_LEN) { |
1113 | printk(KERN_WARNING "%s: Oversized frame received (%d bytes)\n", | 922 | printk(KERN_WARNING "%s: Oversized frame received (%d bytes)\n", |
1114 | dev->name, length); | 923 | dev->name, length); |
1115 | stats->rx_length_errors++; | 924 | stats->rx_length_errors++; |
1116 | stats->rx_errors++; | 925 | goto update_stats; |
1117 | goto drop; | ||
1118 | } | 926 | } |
1119 | 927 | ||
1120 | /* We need space for the packet data itself, plus an ethernet | 928 | /* We need space for the packet data itself, plus an ethernet |
@@ -1126,60 +934,53 @@ static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw) | |||
1126 | if (!skb) { | 934 | if (!skb) { |
1127 | printk(KERN_WARNING "%s: Can't allocate skb for Rx\n", | 935 | printk(KERN_WARNING "%s: Can't allocate skb for Rx\n", |
1128 | dev->name); | 936 | dev->name); |
1129 | goto drop; | 937 | goto update_stats; |
1130 | } | 938 | } |
1131 | 939 | ||
1132 | skb_reserve(skb, 2); /* This way the IP header is aligned */ | 940 | /* We'll prepend the header, so reserve space for it. The worst |
941 | case is no decapsulation, when 802.3 header is prepended and | ||
942 | nothing is removed. 2 is for aligning the IP header. */ | ||
943 | skb_reserve(skb, ETH_HLEN + 2); | ||
944 | |||
945 | err = hermes_bap_pread(hw, IRQ_BAP, skb_put(skb, length), | ||
946 | ALIGN(length, 2), rxfid, | ||
947 | HERMES_802_2_OFFSET); | ||
948 | if (err) { | ||
949 | printk(KERN_ERR "%s: error %d reading frame. " | ||
950 | "Frame dropped.\n", dev->name, err); | ||
951 | goto drop; | ||
952 | } | ||
1133 | 953 | ||
1134 | /* Handle decapsulation | 954 | /* Handle decapsulation |
1135 | * In most cases, the firmware tell us about SNAP frames. | 955 | * In most cases, the firmware tell us about SNAP frames. |
1136 | * For some reason, the SNAP frames sent by LinkSys APs | 956 | * For some reason, the SNAP frames sent by LinkSys APs |
1137 | * are not properly recognised by most firmwares. | 957 | * are not properly recognised by most firmwares. |
1138 | * So, check ourselves */ | 958 | * So, check ourselves */ |
1139 | if (((status & HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_1042) || | 959 | if (length >= ENCAPS_OVERHEAD && |
1140 | ((status & HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_TUNNEL) || | 960 | (((status & HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_1042) || |
1141 | is_ethersnap(&hdr)) { | 961 | ((status & HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_TUNNEL) || |
962 | is_ethersnap(skb->data))) { | ||
1142 | /* These indicate a SNAP within 802.2 LLC within | 963 | /* These indicate a SNAP within 802.2 LLC within |
1143 | 802.11 frame which we'll need to de-encapsulate to | 964 | 802.11 frame which we'll need to de-encapsulate to |
1144 | the original EthernetII frame. */ | 965 | the original EthernetII frame. */ |
1145 | 966 | hdr = (struct ethhdr *)skb_push(skb, ETH_HLEN - ENCAPS_OVERHEAD); | |
1146 | if (length < ENCAPS_OVERHEAD) { /* No room for full LLC+SNAP */ | ||
1147 | stats->rx_length_errors++; | ||
1148 | goto drop; | ||
1149 | } | ||
1150 | |||
1151 | /* Remove SNAP header, reconstruct EthernetII frame */ | ||
1152 | data_len = length - ENCAPS_OVERHEAD; | ||
1153 | data_off = HERMES_802_3_OFFSET + sizeof(hdr); | ||
1154 | |||
1155 | eh = (struct ethhdr *)skb_put(skb, ETH_HLEN); | ||
1156 | |||
1157 | memcpy(eh, &hdr, 2 * ETH_ALEN); | ||
1158 | eh->h_proto = hdr.ethertype; | ||
1159 | } else { | 967 | } else { |
1160 | /* All other cases indicate a genuine 802.3 frame. No | 968 | /* 802.3 frame - prepend 802.3 header as is */ |
1161 | decapsulation needed. We just throw the whole | 969 | hdr = (struct ethhdr *)skb_push(skb, ETH_HLEN); |
1162 | thing in, and hope the protocol layer can deal with | 970 | hdr->h_proto = htons(length); |
1163 | it as 802.3 */ | ||
1164 | data_len = length; | ||
1165 | data_off = HERMES_802_3_OFFSET; | ||
1166 | /* FIXME: we re-read from the card data we already read here */ | ||
1167 | } | ||
1168 | |||
1169 | p = skb_put(skb, data_len); | ||
1170 | err = hermes_bap_pread(hw, IRQ_BAP, p, ALIGN(data_len, 2), | ||
1171 | rxfid, data_off); | ||
1172 | if (err) { | ||
1173 | printk(KERN_ERR "%s: error %d reading frame. " | ||
1174 | "Frame dropped.\n", dev->name, err); | ||
1175 | stats->rx_errors++; | ||
1176 | goto drop; | ||
1177 | } | 971 | } |
972 | memcpy(hdr->h_dest, desc.addr1, ETH_ALEN); | ||
973 | if (fc & IEEE80211_FCTL_FROMDS) | ||
974 | memcpy(hdr->h_source, desc.addr3, ETH_ALEN); | ||
975 | else | ||
976 | memcpy(hdr->h_source, desc.addr2, ETH_ALEN); | ||
1178 | 977 | ||
1179 | dev->last_rx = jiffies; | 978 | dev->last_rx = jiffies; |
1180 | skb->dev = dev; | 979 | skb->dev = dev; |
1181 | skb->protocol = eth_type_trans(skb, dev); | 980 | skb->protocol = eth_type_trans(skb, dev); |
1182 | skb->ip_summed = CHECKSUM_NONE; | 981 | skb->ip_summed = CHECKSUM_NONE; |
982 | if (fc & IEEE80211_FCTL_TODS) | ||
983 | skb->pkt_type = PACKET_OTHERHOST; | ||
1183 | 984 | ||
1184 | /* Process the wireless stats if needed */ | 985 | /* Process the wireless stats if needed */ |
1185 | orinoco_stat_gather(dev, skb, &desc); | 986 | orinoco_stat_gather(dev, skb, &desc); |
@@ -1192,11 +993,10 @@ static void __orinoco_ev_rx(struct net_device *dev, hermes_t *hw) | |||
1192 | return; | 993 | return; |
1193 | 994 | ||
1194 | drop: | 995 | drop: |
996 | dev_kfree_skb_irq(skb); | ||
997 | update_stats: | ||
998 | stats->rx_errors++; | ||
1195 | stats->rx_dropped++; | 999 | stats->rx_dropped++; |
1196 | |||
1197 | if (skb) | ||
1198 | dev_kfree_skb_irq(skb); | ||
1199 | return; | ||
1200 | } | 1000 | } |
1201 | 1001 | ||
1202 | /********************************************************************/ | 1002 | /********************************************************************/ |
@@ -1240,6 +1040,99 @@ static void print_linkstatus(struct net_device *dev, u16 status) | |||
1240 | dev->name, s, status); | 1040 | dev->name, s, status); |
1241 | } | 1041 | } |
1242 | 1042 | ||
1043 | /* Search scan results for requested BSSID, join it if found */ | ||
1044 | static void orinoco_join_ap(struct net_device *dev) | ||
1045 | { | ||
1046 | struct orinoco_private *priv = netdev_priv(dev); | ||
1047 | struct hermes *hw = &priv->hw; | ||
1048 | int err; | ||
1049 | unsigned long flags; | ||
1050 | struct join_req { | ||
1051 | u8 bssid[ETH_ALEN]; | ||
1052 | u16 channel; | ||
1053 | } __attribute__ ((packed)) req; | ||
1054 | const int atom_len = offsetof(struct prism2_scan_apinfo, atim); | ||
1055 | struct prism2_scan_apinfo *atom; | ||
1056 | int offset = 4; | ||
1057 | u8 *buf; | ||
1058 | u16 len; | ||
1059 | |||
1060 | /* Allocate buffer for scan results */ | ||
1061 | buf = kmalloc(MAX_SCAN_LEN, GFP_KERNEL); | ||
1062 | if (! buf) | ||
1063 | return; | ||
1064 | |||
1065 | if (orinoco_lock(priv, &flags) != 0) | ||
1066 | goto out; | ||
1067 | |||
1068 | /* Sanity checks in case user changed something in the meantime */ | ||
1069 | if (! priv->bssid_fixed) | ||
1070 | goto out; | ||
1071 | |||
1072 | if (strlen(priv->desired_essid) == 0) | ||
1073 | goto out; | ||
1074 | |||
1075 | /* Read scan results from the firmware */ | ||
1076 | err = hermes_read_ltv(hw, USER_BAP, | ||
1077 | HERMES_RID_SCANRESULTSTABLE, | ||
1078 | MAX_SCAN_LEN, &len, buf); | ||
1079 | if (err) { | ||
1080 | printk(KERN_ERR "%s: Cannot read scan results\n", | ||
1081 | dev->name); | ||
1082 | goto out; | ||
1083 | } | ||
1084 | |||
1085 | len = HERMES_RECLEN_TO_BYTES(len); | ||
1086 | |||
1087 | /* Go through the scan results looking for the channel of the AP | ||
1088 | * we were requested to join */ | ||
1089 | for (; offset + atom_len <= len; offset += atom_len) { | ||
1090 | atom = (struct prism2_scan_apinfo *) (buf + offset); | ||
1091 | if (memcmp(&atom->bssid, priv->desired_bssid, ETH_ALEN) == 0) | ||
1092 | goto found; | ||
1093 | } | ||
1094 | |||
1095 | DEBUG(1, "%s: Requested AP not found in scan results\n", | ||
1096 | dev->name); | ||
1097 | goto out; | ||
1098 | |||
1099 | found: | ||
1100 | memcpy(req.bssid, priv->desired_bssid, ETH_ALEN); | ||
1101 | req.channel = atom->channel; /* both are little-endian */ | ||
1102 | err = HERMES_WRITE_RECORD(hw, USER_BAP, HERMES_RID_CNFJOINREQUEST, | ||
1103 | &req); | ||
1104 | if (err) | ||
1105 | printk(KERN_ERR "%s: Error issuing join request\n", dev->name); | ||
1106 | |||
1107 | out: | ||
1108 | kfree(buf); | ||
1109 | orinoco_unlock(priv, &flags); | ||
1110 | } | ||
1111 | |||
1112 | /* Send new BSSID to userspace */ | ||
1113 | static void orinoco_send_wevents(struct net_device *dev) | ||
1114 | { | ||
1115 | struct orinoco_private *priv = netdev_priv(dev); | ||
1116 | struct hermes *hw = &priv->hw; | ||
1117 | union iwreq_data wrqu; | ||
1118 | int err; | ||
1119 | unsigned long flags; | ||
1120 | |||
1121 | if (orinoco_lock(priv, &flags) != 0) | ||
1122 | return; | ||
1123 | |||
1124 | err = hermes_read_ltv(hw, IRQ_BAP, HERMES_RID_CURRENTBSSID, | ||
1125 | ETH_ALEN, NULL, wrqu.ap_addr.sa_data); | ||
1126 | if (err != 0) | ||
1127 | return; | ||
1128 | |||
1129 | wrqu.ap_addr.sa_family = ARPHRD_ETHER; | ||
1130 | |||
1131 | /* Send event to user space */ | ||
1132 | wireless_send_event(dev, SIOCGIWAP, &wrqu, NULL); | ||
1133 | orinoco_unlock(priv, &flags); | ||
1134 | } | ||
1135 | |||
1243 | static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw) | 1136 | static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw) |
1244 | { | 1137 | { |
1245 | struct orinoco_private *priv = netdev_priv(dev); | 1138 | struct orinoco_private *priv = netdev_priv(dev); |
@@ -1307,6 +1200,9 @@ static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw) | |||
1307 | u16 newstatus; | 1200 | u16 newstatus; |
1308 | int connected; | 1201 | int connected; |
1309 | 1202 | ||
1203 | if (priv->iw_mode == IW_MODE_MONITOR) | ||
1204 | break; | ||
1205 | |||
1310 | if (len != sizeof(linkstatus)) { | 1206 | if (len != sizeof(linkstatus)) { |
1311 | printk(KERN_WARNING "%s: Unexpected size for linkstatus frame (%d bytes)\n", | 1207 | printk(KERN_WARNING "%s: Unexpected size for linkstatus frame (%d bytes)\n", |
1312 | dev->name, len); | 1208 | dev->name, len); |
@@ -1319,6 +1215,15 @@ static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw) | |||
1319 | break; | 1215 | break; |
1320 | newstatus = le16_to_cpu(linkstatus.linkstatus); | 1216 | newstatus = le16_to_cpu(linkstatus.linkstatus); |
1321 | 1217 | ||
1218 | /* Symbol firmware uses "out of range" to signal that | ||
1219 | * the hostscan frame can be requested. */ | ||
1220 | if (newstatus == HERMES_LINKSTATUS_AP_OUT_OF_RANGE && | ||
1221 | priv->firmware_type == FIRMWARE_TYPE_SYMBOL && | ||
1222 | priv->has_hostscan && priv->scan_inprogress) { | ||
1223 | hermes_inquire(hw, HERMES_INQ_HOSTSCAN_SYMBOL); | ||
1224 | break; | ||
1225 | } | ||
1226 | |||
1322 | connected = (newstatus == HERMES_LINKSTATUS_CONNECTED) | 1227 | connected = (newstatus == HERMES_LINKSTATUS_CONNECTED) |
1323 | || (newstatus == HERMES_LINKSTATUS_AP_CHANGE) | 1228 | || (newstatus == HERMES_LINKSTATUS_AP_CHANGE) |
1324 | || (newstatus == HERMES_LINKSTATUS_AP_IN_RANGE); | 1229 | || (newstatus == HERMES_LINKSTATUS_AP_IN_RANGE); |
@@ -1328,12 +1233,89 @@ static void __orinoco_ev_info(struct net_device *dev, hermes_t *hw) | |||
1328 | else if (!ignore_disconnect) | 1233 | else if (!ignore_disconnect) |
1329 | netif_carrier_off(dev); | 1234 | netif_carrier_off(dev); |
1330 | 1235 | ||
1331 | if (newstatus != priv->last_linkstatus) | 1236 | if (newstatus != priv->last_linkstatus) { |
1237 | priv->last_linkstatus = newstatus; | ||
1332 | print_linkstatus(dev, newstatus); | 1238 | print_linkstatus(dev, newstatus); |
1239 | /* The info frame contains only one word which is the | ||
1240 | * status (see hermes.h). The status is pretty boring | ||
1241 | * in itself, that's why we export the new BSSID... | ||
1242 | * Jean II */ | ||
1243 | schedule_work(&priv->wevent_work); | ||
1244 | } | ||
1245 | } | ||
1246 | break; | ||
1247 | case HERMES_INQ_SCAN: | ||
1248 | if (!priv->scan_inprogress && priv->bssid_fixed && | ||
1249 | priv->firmware_type == FIRMWARE_TYPE_INTERSIL) { | ||
1250 | schedule_work(&priv->join_work); | ||
1251 | break; | ||
1252 | } | ||
1253 | /* fall through */ | ||
1254 | case HERMES_INQ_HOSTSCAN: | ||
1255 | case HERMES_INQ_HOSTSCAN_SYMBOL: { | ||
1256 | /* Result of a scanning. Contains information about | ||
1257 | * cells in the vicinity - Jean II */ | ||
1258 | union iwreq_data wrqu; | ||
1259 | unsigned char *buf; | ||
1260 | |||
1261 | /* Sanity check */ | ||
1262 | if (len > 4096) { | ||
1263 | printk(KERN_WARNING "%s: Scan results too large (%d bytes)\n", | ||
1264 | dev->name, len); | ||
1265 | break; | ||
1266 | } | ||
1333 | 1267 | ||
1334 | priv->last_linkstatus = newstatus; | 1268 | /* We are a strict producer. If the previous scan results |
1269 | * have not been consumed, we just have to drop this | ||
1270 | * frame. We can't remove the previous results ourselves, | ||
1271 | * that would be *very* racy... Jean II */ | ||
1272 | if (priv->scan_result != NULL) { | ||
1273 | printk(KERN_WARNING "%s: Previous scan results not consumed, dropping info frame.\n", dev->name); | ||
1274 | break; | ||
1275 | } | ||
1276 | |||
1277 | /* Allocate buffer for results */ | ||
1278 | buf = kmalloc(len, GFP_ATOMIC); | ||
1279 | if (buf == NULL) | ||
1280 | /* No memory, so can't printk()... */ | ||
1281 | break; | ||
1282 | |||
1283 | /* Read scan data */ | ||
1284 | err = hermes_bap_pread(hw, IRQ_BAP, (void *) buf, len, | ||
1285 | infofid, sizeof(info)); | ||
1286 | if (err) | ||
1287 | break; | ||
1288 | |||
1289 | #ifdef ORINOCO_DEBUG | ||
1290 | { | ||
1291 | int i; | ||
1292 | printk(KERN_DEBUG "Scan result [%02X", buf[0]); | ||
1293 | for(i = 1; i < (len * 2); i++) | ||
1294 | printk(":%02X", buf[i]); | ||
1295 | printk("]\n"); | ||
1296 | } | ||
1297 | #endif /* ORINOCO_DEBUG */ | ||
1298 | |||
1299 | /* Allow the clients to access the results */ | ||
1300 | priv->scan_len = len; | ||
1301 | priv->scan_result = buf; | ||
1302 | |||
1303 | /* Send an empty event to user space. | ||
1304 | * We don't send the received data on the event because | ||
1305 | * it would require us to do complex transcoding, and | ||
1306 | * we want to minimise the work done in the irq handler | ||
1307 | * Use a request to extract the data - Jean II */ | ||
1308 | wrqu.data.length = 0; | ||
1309 | wrqu.data.flags = 0; | ||
1310 | wireless_send_event(dev, SIOCGIWSCAN, &wrqu, NULL); | ||
1335 | } | 1311 | } |
1336 | break; | 1312 | break; |
1313 | case HERMES_INQ_SEC_STAT_AGERE: | ||
1314 | /* Security status (Agere specific) */ | ||
1315 | /* Ignore this frame for now */ | ||
1316 | if (priv->firmware_type == FIRMWARE_TYPE_AGERE) | ||
1317 | break; | ||
1318 | /* fall through */ | ||
1337 | default: | 1319 | default: |
1338 | printk(KERN_DEBUG "%s: Unknown information frame received: " | 1320 | printk(KERN_DEBUG "%s: Unknown information frame received: " |
1339 | "type 0x%04x, length %d\n", dev->name, type, len); | 1321 | "type 0x%04x, length %d\n", dev->name, type, len); |
@@ -1470,6 +1452,36 @@ static int __orinoco_hw_set_bitrate(struct orinoco_private *priv) | |||
1470 | return err; | 1452 | return err; |
1471 | } | 1453 | } |
1472 | 1454 | ||
1455 | /* Set fixed AP address */ | ||
1456 | static int __orinoco_hw_set_wap(struct orinoco_private *priv) | ||
1457 | { | ||
1458 | int roaming_flag; | ||
1459 | int err = 0; | ||
1460 | hermes_t *hw = &priv->hw; | ||
1461 | |||
1462 | switch (priv->firmware_type) { | ||
1463 | case FIRMWARE_TYPE_AGERE: | ||
1464 | /* not supported */ | ||
1465 | break; | ||
1466 | case FIRMWARE_TYPE_INTERSIL: | ||
1467 | if (priv->bssid_fixed) | ||
1468 | roaming_flag = 2; | ||
1469 | else | ||
1470 | roaming_flag = 1; | ||
1471 | |||
1472 | err = hermes_write_wordrec(hw, USER_BAP, | ||
1473 | HERMES_RID_CNFROAMINGMODE, | ||
1474 | roaming_flag); | ||
1475 | break; | ||
1476 | case FIRMWARE_TYPE_SYMBOL: | ||
1477 | err = HERMES_WRITE_RECORD(hw, USER_BAP, | ||
1478 | HERMES_RID_CNFMANDATORYBSSID_SYMBOL, | ||
1479 | &priv->desired_bssid); | ||
1480 | break; | ||
1481 | } | ||
1482 | return err; | ||
1483 | } | ||
1484 | |||
1473 | /* Change the WEP keys and/or the current keys. Can be called | 1485 | /* Change the WEP keys and/or the current keys. Can be called |
1474 | * either from __orinoco_hw_setup_wep() or directly from | 1486 | * either from __orinoco_hw_setup_wep() or directly from |
1475 | * orinoco_ioctl_setiwencode(). In the later case the association | 1487 | * orinoco_ioctl_setiwencode(). In the later case the association |
@@ -1655,6 +1667,13 @@ static int __orinoco_program_rids(struct net_device *dev) | |||
1655 | } | 1667 | } |
1656 | } | 1668 | } |
1657 | 1669 | ||
1670 | /* Set the desired BSSID */ | ||
1671 | err = __orinoco_hw_set_wap(priv); | ||
1672 | if (err) { | ||
1673 | printk(KERN_ERR "%s: Error %d setting AP address\n", | ||
1674 | dev->name, err); | ||
1675 | return err; | ||
1676 | } | ||
1658 | /* Set the desired ESSID */ | 1677 | /* Set the desired ESSID */ |
1659 | idbuf.len = cpu_to_le16(strlen(priv->desired_essid)); | 1678 | idbuf.len = cpu_to_le16(strlen(priv->desired_essid)); |
1660 | memcpy(&idbuf.val, priv->desired_essid, sizeof(idbuf.val)); | 1679 | memcpy(&idbuf.val, priv->desired_essid, sizeof(idbuf.val)); |
@@ -1793,6 +1812,20 @@ static int __orinoco_program_rids(struct net_device *dev) | |||
1793 | } | 1812 | } |
1794 | } | 1813 | } |
1795 | 1814 | ||
1815 | if (priv->iw_mode == IW_MODE_MONITOR) { | ||
1816 | /* Enable monitor mode */ | ||
1817 | dev->type = ARPHRD_IEEE80211; | ||
1818 | err = hermes_docmd_wait(hw, HERMES_CMD_TEST | | ||
1819 | HERMES_TEST_MONITOR, 0, NULL); | ||
1820 | } else { | ||
1821 | /* Disable monitor mode */ | ||
1822 | dev->type = ARPHRD_ETHER; | ||
1823 | err = hermes_docmd_wait(hw, HERMES_CMD_TEST | | ||
1824 | HERMES_TEST_STOP, 0, NULL); | ||
1825 | } | ||
1826 | if (err) | ||
1827 | return err; | ||
1828 | |||
1796 | /* Set promiscuity / multicast*/ | 1829 | /* Set promiscuity / multicast*/ |
1797 | priv->promiscuous = 0; | 1830 | priv->promiscuous = 0; |
1798 | priv->mc_count = 0; | 1831 | priv->mc_count = 0; |
@@ -1869,55 +1902,6 @@ __orinoco_set_multicast_list(struct net_device *dev) | |||
1869 | dev->flags &= ~IFF_PROMISC; | 1902 | dev->flags &= ~IFF_PROMISC; |
1870 | } | 1903 | } |
1871 | 1904 | ||
1872 | static int orinoco_reconfigure(struct net_device *dev) | ||
1873 | { | ||
1874 | struct orinoco_private *priv = netdev_priv(dev); | ||
1875 | struct hermes *hw = &priv->hw; | ||
1876 | unsigned long flags; | ||
1877 | int err = 0; | ||
1878 | |||
1879 | if (priv->broken_disableport) { | ||
1880 | schedule_work(&priv->reset_work); | ||
1881 | return 0; | ||
1882 | } | ||
1883 | |||
1884 | if (orinoco_lock(priv, &flags) != 0) | ||
1885 | return -EBUSY; | ||
1886 | |||
1887 | err = hermes_disable_port(hw, 0); | ||
1888 | if (err) { | ||
1889 | printk(KERN_WARNING "%s: Unable to disable port while reconfiguring card\n", | ||
1890 | dev->name); | ||
1891 | priv->broken_disableport = 1; | ||
1892 | goto out; | ||
1893 | } | ||
1894 | |||
1895 | err = __orinoco_program_rids(dev); | ||
1896 | if (err) { | ||
1897 | printk(KERN_WARNING "%s: Unable to reconfigure card\n", | ||
1898 | dev->name); | ||
1899 | goto out; | ||
1900 | } | ||
1901 | |||
1902 | err = hermes_enable_port(hw, 0); | ||
1903 | if (err) { | ||
1904 | printk(KERN_WARNING "%s: Unable to enable port while reconfiguring card\n", | ||
1905 | dev->name); | ||
1906 | goto out; | ||
1907 | } | ||
1908 | |||
1909 | out: | ||
1910 | if (err) { | ||
1911 | printk(KERN_WARNING "%s: Resetting instead...\n", dev->name); | ||
1912 | schedule_work(&priv->reset_work); | ||
1913 | err = 0; | ||
1914 | } | ||
1915 | |||
1916 | orinoco_unlock(priv, &flags); | ||
1917 | return err; | ||
1918 | |||
1919 | } | ||
1920 | |||
1921 | /* This must be called from user context, without locks held - use | 1905 | /* This must be called from user context, without locks held - use |
1922 | * schedule_work() */ | 1906 | * schedule_work() */ |
1923 | static void orinoco_reset(struct net_device *dev) | 1907 | static void orinoco_reset(struct net_device *dev) |
@@ -1946,6 +1930,11 @@ static void orinoco_reset(struct net_device *dev) | |||
1946 | 1930 | ||
1947 | orinoco_unlock(priv, &flags); | 1931 | orinoco_unlock(priv, &flags); |
1948 | 1932 | ||
1933 | /* Scanning support: Cleanup of driver struct */ | ||
1934 | kfree(priv->scan_result); | ||
1935 | priv->scan_result = NULL; | ||
1936 | priv->scan_inprogress = 0; | ||
1937 | |||
1949 | if (priv->hard_reset) { | 1938 | if (priv->hard_reset) { |
1950 | err = (*priv->hard_reset)(priv); | 1939 | err = (*priv->hard_reset)(priv); |
1951 | if (err) { | 1940 | if (err) { |
@@ -2184,6 +2173,8 @@ static int determine_firmware(struct net_device *dev) | |||
2184 | priv->has_mwo = (firmver >= 0x60000); | 2173 | priv->has_mwo = (firmver >= 0x60000); |
2185 | priv->has_pm = (firmver >= 0x40020); /* Don't work in 7.52 ? */ | 2174 | priv->has_pm = (firmver >= 0x40020); /* Don't work in 7.52 ? */ |
2186 | priv->ibss_port = 1; | 2175 | priv->ibss_port = 1; |
2176 | priv->has_hostscan = (firmver >= 0x8000a); | ||
2177 | priv->broken_monitor = (firmver >= 0x80000); | ||
2187 | 2178 | ||
2188 | /* Tested with Agere firmware : | 2179 | /* Tested with Agere firmware : |
2189 | * 1.16 ; 4.08 ; 4.52 ; 6.04 ; 6.16 ; 7.28 => Jean II | 2180 | * 1.16 ; 4.08 ; 4.52 ; 6.04 ; 6.16 ; 7.28 => Jean II |
@@ -2229,6 +2220,8 @@ static int determine_firmware(struct net_device *dev) | |||
2229 | priv->ibss_port = 4; | 2220 | priv->ibss_port = 4; |
2230 | priv->broken_disableport = (firmver == 0x25013) || | 2221 | priv->broken_disableport = (firmver == 0x25013) || |
2231 | (firmver >= 0x30000 && firmver <= 0x31000); | 2222 | (firmver >= 0x30000 && firmver <= 0x31000); |
2223 | priv->has_hostscan = (firmver >= 0x31001) || | ||
2224 | (firmver >= 0x29057 && firmver < 0x30000); | ||
2232 | /* Tested with Intel firmware : 0x20015 => Jean II */ | 2225 | /* Tested with Intel firmware : 0x20015 => Jean II */ |
2233 | /* Tested with 3Com firmware : 0x15012 & 0x22001 => Jean II */ | 2226 | /* Tested with 3Com firmware : 0x15012 & 0x22001 => Jean II */ |
2234 | break; | 2227 | break; |
@@ -2248,6 +2241,7 @@ static int determine_firmware(struct net_device *dev) | |||
2248 | priv->has_ibss = (firmver >= 0x000700); /* FIXME */ | 2241 | priv->has_ibss = (firmver >= 0x000700); /* FIXME */ |
2249 | priv->has_big_wep = priv->has_wep = (firmver >= 0x000800); | 2242 | priv->has_big_wep = priv->has_wep = (firmver >= 0x000800); |
2250 | priv->has_pm = (firmver >= 0x000700); | 2243 | priv->has_pm = (firmver >= 0x000700); |
2244 | priv->has_hostscan = (firmver >= 0x010301); | ||
2251 | 2245 | ||
2252 | if (firmver >= 0x000800) | 2246 | if (firmver >= 0x000800) |
2253 | priv->ibss_port = 0; | 2247 | priv->ibss_port = 0; |
@@ -2456,8 +2450,9 @@ struct net_device *alloc_orinocodev(int sizeof_card, | |||
2456 | dev->tx_timeout = orinoco_tx_timeout; | 2450 | dev->tx_timeout = orinoco_tx_timeout; |
2457 | dev->watchdog_timeo = HZ; /* 1 second timeout */ | 2451 | dev->watchdog_timeo = HZ; /* 1 second timeout */ |
2458 | dev->get_stats = orinoco_get_stats; | 2452 | dev->get_stats = orinoco_get_stats; |
2453 | dev->ethtool_ops = &orinoco_ethtool_ops; | ||
2459 | dev->get_wireless_stats = orinoco_get_wireless_stats; | 2454 | dev->get_wireless_stats = orinoco_get_wireless_stats; |
2460 | dev->do_ioctl = orinoco_ioctl; | 2455 | dev->wireless_handlers = (struct iw_handler_def *)&orinoco_handler_def; |
2461 | dev->change_mtu = orinoco_change_mtu; | 2456 | dev->change_mtu = orinoco_change_mtu; |
2462 | dev->set_multicast_list = orinoco_set_multicast_list; | 2457 | dev->set_multicast_list = orinoco_set_multicast_list; |
2463 | /* we use the default eth_mac_addr for setting the MAC addr */ | 2458 | /* we use the default eth_mac_addr for setting the MAC addr */ |
@@ -2473,6 +2468,8 @@ struct net_device *alloc_orinocodev(int sizeof_card, | |||
2473 | * before anything else touches the | 2468 | * before anything else touches the |
2474 | * hardware */ | 2469 | * hardware */ |
2475 | INIT_WORK(&priv->reset_work, (void (*)(void *))orinoco_reset, dev); | 2470 | INIT_WORK(&priv->reset_work, (void (*)(void *))orinoco_reset, dev); |
2471 | INIT_WORK(&priv->join_work, (void (*)(void *))orinoco_join_ap, dev); | ||
2472 | INIT_WORK(&priv->wevent_work, (void (*)(void *))orinoco_send_wevents, dev); | ||
2476 | 2473 | ||
2477 | netif_carrier_off(dev); | 2474 | netif_carrier_off(dev); |
2478 | priv->last_linkstatus = 0xffff; | 2475 | priv->last_linkstatus = 0xffff; |
@@ -2483,6 +2480,9 @@ struct net_device *alloc_orinocodev(int sizeof_card, | |||
2483 | 2480 | ||
2484 | void free_orinocodev(struct net_device *dev) | 2481 | void free_orinocodev(struct net_device *dev) |
2485 | { | 2482 | { |
2483 | struct orinoco_private *priv = netdev_priv(dev); | ||
2484 | |||
2485 | kfree(priv->scan_result); | ||
2486 | free_netdev(dev); | 2486 | free_netdev(dev); |
2487 | } | 2487 | } |
2488 | 2488 | ||
@@ -2490,24 +2490,6 @@ void free_orinocodev(struct net_device *dev) | |||
2490 | /* Wireless extensions */ | 2490 | /* Wireless extensions */ |
2491 | /********************************************************************/ | 2491 | /********************************************************************/ |
2492 | 2492 | ||
2493 | static int orinoco_hw_get_bssid(struct orinoco_private *priv, | ||
2494 | char buf[ETH_ALEN]) | ||
2495 | { | ||
2496 | hermes_t *hw = &priv->hw; | ||
2497 | int err = 0; | ||
2498 | unsigned long flags; | ||
2499 | |||
2500 | if (orinoco_lock(priv, &flags) != 0) | ||
2501 | return -EBUSY; | ||
2502 | |||
2503 | err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CURRENTBSSID, | ||
2504 | ETH_ALEN, NULL, buf); | ||
2505 | |||
2506 | orinoco_unlock(priv, &flags); | ||
2507 | |||
2508 | return err; | ||
2509 | } | ||
2510 | |||
2511 | static int orinoco_hw_get_essid(struct orinoco_private *priv, int *active, | 2493 | static int orinoco_hw_get_essid(struct orinoco_private *priv, int *active, |
2512 | char buf[IW_ESSID_MAX_SIZE+1]) | 2494 | char buf[IW_ESSID_MAX_SIZE+1]) |
2513 | { | 2495 | { |
@@ -2633,140 +2615,271 @@ static int orinoco_hw_get_bitratelist(struct orinoco_private *priv, | |||
2633 | return 0; | 2615 | return 0; |
2634 | } | 2616 | } |
2635 | 2617 | ||
2636 | static int orinoco_ioctl_getiwrange(struct net_device *dev, struct iw_point *rrq) | 2618 | static int orinoco_ioctl_getname(struct net_device *dev, |
2619 | struct iw_request_info *info, | ||
2620 | char *name, | ||
2621 | char *extra) | ||
2637 | { | 2622 | { |
2638 | struct orinoco_private *priv = netdev_priv(dev); | 2623 | struct orinoco_private *priv = netdev_priv(dev); |
2639 | int err = 0; | ||
2640 | int mode; | ||
2641 | struct iw_range range; | ||
2642 | int numrates; | 2624 | int numrates; |
2643 | int i, k; | 2625 | int err; |
2626 | |||
2627 | err = orinoco_hw_get_bitratelist(priv, &numrates, NULL, 0); | ||
2628 | |||
2629 | if (!err && (numrates > 2)) | ||
2630 | strcpy(name, "IEEE 802.11b"); | ||
2631 | else | ||
2632 | strcpy(name, "IEEE 802.11-DS"); | ||
2633 | |||
2634 | return 0; | ||
2635 | } | ||
2636 | |||
2637 | static int orinoco_ioctl_setwap(struct net_device *dev, | ||
2638 | struct iw_request_info *info, | ||
2639 | struct sockaddr *ap_addr, | ||
2640 | char *extra) | ||
2641 | { | ||
2642 | struct orinoco_private *priv = netdev_priv(dev); | ||
2643 | int err = -EINPROGRESS; /* Call commit handler */ | ||
2644 | unsigned long flags; | 2644 | unsigned long flags; |
2645 | static const u8 off_addr[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; | ||
2646 | static const u8 any_addr[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; | ||
2645 | 2647 | ||
2646 | TRACE_ENTER(dev->name); | 2648 | if (orinoco_lock(priv, &flags) != 0) |
2649 | return -EBUSY; | ||
2650 | |||
2651 | /* Enable automatic roaming - no sanity checks are needed */ | ||
2652 | if (memcmp(&ap_addr->sa_data, off_addr, ETH_ALEN) == 0 || | ||
2653 | memcmp(&ap_addr->sa_data, any_addr, ETH_ALEN) == 0) { | ||
2654 | priv->bssid_fixed = 0; | ||
2655 | memset(priv->desired_bssid, 0, ETH_ALEN); | ||
2656 | |||
2657 | /* "off" means keep existing connection */ | ||
2658 | if (ap_addr->sa_data[0] == 0) { | ||
2659 | __orinoco_hw_set_wap(priv); | ||
2660 | err = 0; | ||
2661 | } | ||
2662 | goto out; | ||
2663 | } | ||
2664 | |||
2665 | if (priv->firmware_type == FIRMWARE_TYPE_AGERE) { | ||
2666 | printk(KERN_WARNING "%s: Lucent/Agere firmware doesn't " | ||
2667 | "support manual roaming\n", | ||
2668 | dev->name); | ||
2669 | err = -EOPNOTSUPP; | ||
2670 | goto out; | ||
2671 | } | ||
2672 | |||
2673 | if (priv->iw_mode != IW_MODE_INFRA) { | ||
2674 | printk(KERN_WARNING "%s: Manual roaming supported only in " | ||
2675 | "managed mode\n", dev->name); | ||
2676 | err = -EOPNOTSUPP; | ||
2677 | goto out; | ||
2678 | } | ||
2679 | |||
2680 | /* Intersil firmware hangs without Desired ESSID */ | ||
2681 | if (priv->firmware_type == FIRMWARE_TYPE_INTERSIL && | ||
2682 | strlen(priv->desired_essid) == 0) { | ||
2683 | printk(KERN_WARNING "%s: Desired ESSID must be set for " | ||
2684 | "manual roaming\n", dev->name); | ||
2685 | err = -EOPNOTSUPP; | ||
2686 | goto out; | ||
2687 | } | ||
2688 | |||
2689 | /* Finally, enable manual roaming */ | ||
2690 | priv->bssid_fixed = 1; | ||
2691 | memcpy(priv->desired_bssid, &ap_addr->sa_data, ETH_ALEN); | ||
2692 | |||
2693 | out: | ||
2694 | orinoco_unlock(priv, &flags); | ||
2695 | return err; | ||
2696 | } | ||
2697 | |||
2698 | static int orinoco_ioctl_getwap(struct net_device *dev, | ||
2699 | struct iw_request_info *info, | ||
2700 | struct sockaddr *ap_addr, | ||
2701 | char *extra) | ||
2702 | { | ||
2703 | struct orinoco_private *priv = netdev_priv(dev); | ||
2704 | |||
2705 | hermes_t *hw = &priv->hw; | ||
2706 | int err = 0; | ||
2707 | unsigned long flags; | ||
2708 | |||
2709 | if (orinoco_lock(priv, &flags) != 0) | ||
2710 | return -EBUSY; | ||
2711 | |||
2712 | ap_addr->sa_family = ARPHRD_ETHER; | ||
2713 | err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CURRENTBSSID, | ||
2714 | ETH_ALEN, NULL, ap_addr->sa_data); | ||
2715 | |||
2716 | orinoco_unlock(priv, &flags); | ||
2717 | |||
2718 | return err; | ||
2719 | } | ||
2647 | 2720 | ||
2648 | if (!access_ok(VERIFY_WRITE, rrq->pointer, sizeof(range))) | 2721 | static int orinoco_ioctl_setmode(struct net_device *dev, |
2649 | return -EFAULT; | 2722 | struct iw_request_info *info, |
2723 | u32 *mode, | ||
2724 | char *extra) | ||
2725 | { | ||
2726 | struct orinoco_private *priv = netdev_priv(dev); | ||
2727 | int err = -EINPROGRESS; /* Call commit handler */ | ||
2728 | unsigned long flags; | ||
2650 | 2729 | ||
2651 | rrq->length = sizeof(range); | 2730 | if (priv->iw_mode == *mode) |
2731 | return 0; | ||
2652 | 2732 | ||
2653 | if (orinoco_lock(priv, &flags) != 0) | 2733 | if (orinoco_lock(priv, &flags) != 0) |
2654 | return -EBUSY; | 2734 | return -EBUSY; |
2655 | 2735 | ||
2656 | mode = priv->iw_mode; | 2736 | switch (*mode) { |
2737 | case IW_MODE_ADHOC: | ||
2738 | if (!priv->has_ibss && !priv->has_port3) | ||
2739 | err = -EOPNOTSUPP; | ||
2740 | break; | ||
2741 | |||
2742 | case IW_MODE_INFRA: | ||
2743 | break; | ||
2744 | |||
2745 | case IW_MODE_MONITOR: | ||
2746 | if (priv->broken_monitor && !force_monitor) { | ||
2747 | printk(KERN_WARNING "%s: Monitor mode support is " | ||
2748 | "buggy in this firmware, not enabling\n", | ||
2749 | dev->name); | ||
2750 | err = -EOPNOTSUPP; | ||
2751 | } | ||
2752 | break; | ||
2753 | |||
2754 | default: | ||
2755 | err = -EOPNOTSUPP; | ||
2756 | break; | ||
2757 | } | ||
2758 | |||
2759 | if (err == -EINPROGRESS) { | ||
2760 | priv->iw_mode = *mode; | ||
2761 | set_port_type(priv); | ||
2762 | } | ||
2763 | |||
2657 | orinoco_unlock(priv, &flags); | 2764 | orinoco_unlock(priv, &flags); |
2658 | 2765 | ||
2659 | memset(&range, 0, sizeof(range)); | 2766 | return err; |
2767 | } | ||
2768 | |||
2769 | static int orinoco_ioctl_getmode(struct net_device *dev, | ||
2770 | struct iw_request_info *info, | ||
2771 | u32 *mode, | ||
2772 | char *extra) | ||
2773 | { | ||
2774 | struct orinoco_private *priv = netdev_priv(dev); | ||
2775 | |||
2776 | *mode = priv->iw_mode; | ||
2777 | return 0; | ||
2778 | } | ||
2779 | |||
2780 | static int orinoco_ioctl_getiwrange(struct net_device *dev, | ||
2781 | struct iw_request_info *info, | ||
2782 | struct iw_point *rrq, | ||
2783 | char *extra) | ||
2784 | { | ||
2785 | struct orinoco_private *priv = netdev_priv(dev); | ||
2786 | int err = 0; | ||
2787 | struct iw_range *range = (struct iw_range *) extra; | ||
2788 | int numrates; | ||
2789 | int i, k; | ||
2790 | |||
2791 | TRACE_ENTER(dev->name); | ||
2660 | 2792 | ||
2661 | /* Much of this shamelessly taken from wvlan_cs.c. No idea | 2793 | rrq->length = sizeof(struct iw_range); |
2662 | * what it all means -dgibson */ | 2794 | memset(range, 0, sizeof(struct iw_range)); |
2663 | range.we_version_compiled = WIRELESS_EXT; | ||
2664 | range.we_version_source = 11; | ||
2665 | 2795 | ||
2666 | range.min_nwid = range.max_nwid = 0; /* We don't use nwids */ | 2796 | range->we_version_compiled = WIRELESS_EXT; |
2797 | range->we_version_source = 14; | ||
2667 | 2798 | ||
2668 | /* Set available channels/frequencies */ | 2799 | /* Set available channels/frequencies */ |
2669 | range.num_channels = NUM_CHANNELS; | 2800 | range->num_channels = NUM_CHANNELS; |
2670 | k = 0; | 2801 | k = 0; |
2671 | for (i = 0; i < NUM_CHANNELS; i++) { | 2802 | for (i = 0; i < NUM_CHANNELS; i++) { |
2672 | if (priv->channel_mask & (1 << i)) { | 2803 | if (priv->channel_mask & (1 << i)) { |
2673 | range.freq[k].i = i + 1; | 2804 | range->freq[k].i = i + 1; |
2674 | range.freq[k].m = channel_frequency[i] * 100000; | 2805 | range->freq[k].m = channel_frequency[i] * 100000; |
2675 | range.freq[k].e = 1; | 2806 | range->freq[k].e = 1; |
2676 | k++; | 2807 | k++; |
2677 | } | 2808 | } |
2678 | 2809 | ||
2679 | if (k >= IW_MAX_FREQUENCIES) | 2810 | if (k >= IW_MAX_FREQUENCIES) |
2680 | break; | 2811 | break; |
2681 | } | 2812 | } |
2682 | range.num_frequency = k; | 2813 | range->num_frequency = k; |
2814 | range->sensitivity = 3; | ||
2683 | 2815 | ||
2684 | range.sensitivity = 3; | 2816 | if (priv->has_wep) { |
2817 | range->max_encoding_tokens = ORINOCO_MAX_KEYS; | ||
2818 | range->encoding_size[0] = SMALL_KEY_SIZE; | ||
2819 | range->num_encoding_sizes = 1; | ||
2685 | 2820 | ||
2686 | if ((mode == IW_MODE_ADHOC) && (priv->spy_number == 0)){ | 2821 | if (priv->has_big_wep) { |
2822 | range->encoding_size[1] = LARGE_KEY_SIZE; | ||
2823 | range->num_encoding_sizes = 2; | ||
2824 | } | ||
2825 | } | ||
2826 | |||
2827 | if ((priv->iw_mode == IW_MODE_ADHOC) && (priv->spy_number == 0)){ | ||
2687 | /* Quality stats meaningless in ad-hoc mode */ | 2828 | /* Quality stats meaningless in ad-hoc mode */ |
2688 | range.max_qual.qual = 0; | ||
2689 | range.max_qual.level = 0; | ||
2690 | range.max_qual.noise = 0; | ||
2691 | range.avg_qual.qual = 0; | ||
2692 | range.avg_qual.level = 0; | ||
2693 | range.avg_qual.noise = 0; | ||
2694 | } else { | 2829 | } else { |
2695 | range.max_qual.qual = 0x8b - 0x2f; | 2830 | range->max_qual.qual = 0x8b - 0x2f; |
2696 | range.max_qual.level = 0x2f - 0x95 - 1; | 2831 | range->max_qual.level = 0x2f - 0x95 - 1; |
2697 | range.max_qual.noise = 0x2f - 0x95 - 1; | 2832 | range->max_qual.noise = 0x2f - 0x95 - 1; |
2698 | /* Need to get better values */ | 2833 | /* Need to get better values */ |
2699 | range.avg_qual.qual = 0x24; | 2834 | range->avg_qual.qual = 0x24; |
2700 | range.avg_qual.level = 0xC2; | 2835 | range->avg_qual.level = 0xC2; |
2701 | range.avg_qual.noise = 0x9E; | 2836 | range->avg_qual.noise = 0x9E; |
2702 | } | 2837 | } |
2703 | 2838 | ||
2704 | err = orinoco_hw_get_bitratelist(priv, &numrates, | 2839 | err = orinoco_hw_get_bitratelist(priv, &numrates, |
2705 | range.bitrate, IW_MAX_BITRATES); | 2840 | range->bitrate, IW_MAX_BITRATES); |
2706 | if (err) | 2841 | if (err) |
2707 | return err; | 2842 | return err; |
2708 | range.num_bitrates = numrates; | 2843 | range->num_bitrates = numrates; |
2709 | 2844 | ||
2710 | /* Set an indication of the max TCP throughput in bit/s that we can | 2845 | /* Set an indication of the max TCP throughput in bit/s that we can |
2711 | * expect using this interface. May be use for QoS stuff... | 2846 | * expect using this interface. May be use for QoS stuff... |
2712 | * Jean II */ | 2847 | * Jean II */ |
2713 | if(numrates > 2) | 2848 | if (numrates > 2) |
2714 | range.throughput = 5 * 1000 * 1000; /* ~5 Mb/s */ | 2849 | range->throughput = 5 * 1000 * 1000; /* ~5 Mb/s */ |
2715 | else | 2850 | else |
2716 | range.throughput = 1.5 * 1000 * 1000; /* ~1.5 Mb/s */ | 2851 | range->throughput = 1.5 * 1000 * 1000; /* ~1.5 Mb/s */ |
2717 | 2852 | ||
2718 | range.min_rts = 0; | 2853 | range->min_rts = 0; |
2719 | range.max_rts = 2347; | 2854 | range->max_rts = 2347; |
2720 | range.min_frag = 256; | 2855 | range->min_frag = 256; |
2721 | range.max_frag = 2346; | 2856 | range->max_frag = 2346; |
2722 | 2857 | ||
2723 | if (orinoco_lock(priv, &flags) != 0) | 2858 | range->min_pmp = 0; |
2724 | return -EBUSY; | 2859 | range->max_pmp = 65535000; |
2725 | if (priv->has_wep) { | 2860 | range->min_pmt = 0; |
2726 | range.max_encoding_tokens = ORINOCO_MAX_KEYS; | 2861 | range->max_pmt = 65535 * 1000; /* ??? */ |
2727 | 2862 | range->pmp_flags = IW_POWER_PERIOD; | |
2728 | range.encoding_size[0] = SMALL_KEY_SIZE; | 2863 | range->pmt_flags = IW_POWER_TIMEOUT; |
2729 | range.num_encoding_sizes = 1; | 2864 | range->pm_capa = IW_POWER_PERIOD | IW_POWER_TIMEOUT | IW_POWER_UNICAST_R; |
2730 | 2865 | ||
2731 | if (priv->has_big_wep) { | 2866 | range->retry_capa = IW_RETRY_LIMIT | IW_RETRY_LIFETIME; |
2732 | range.encoding_size[1] = LARGE_KEY_SIZE; | 2867 | range->retry_flags = IW_RETRY_LIMIT; |
2733 | range.num_encoding_sizes = 2; | 2868 | range->r_time_flags = IW_RETRY_LIFETIME; |
2734 | } | 2869 | range->min_retry = 0; |
2735 | } else { | 2870 | range->max_retry = 65535; /* ??? */ |
2736 | range.num_encoding_sizes = 0; | 2871 | range->min_r_time = 0; |
2737 | range.max_encoding_tokens = 0; | 2872 | range->max_r_time = 65535 * 1000; /* ??? */ |
2738 | } | ||
2739 | orinoco_unlock(priv, &flags); | ||
2740 | |||
2741 | range.min_pmp = 0; | ||
2742 | range.max_pmp = 65535000; | ||
2743 | range.min_pmt = 0; | ||
2744 | range.max_pmt = 65535 * 1000; /* ??? */ | ||
2745 | range.pmp_flags = IW_POWER_PERIOD; | ||
2746 | range.pmt_flags = IW_POWER_TIMEOUT; | ||
2747 | range.pm_capa = IW_POWER_PERIOD | IW_POWER_TIMEOUT | IW_POWER_UNICAST_R; | ||
2748 | |||
2749 | range.num_txpower = 1; | ||
2750 | range.txpower[0] = 15; /* 15dBm */ | ||
2751 | range.txpower_capa = IW_TXPOW_DBM; | ||
2752 | |||
2753 | range.retry_capa = IW_RETRY_LIMIT | IW_RETRY_LIFETIME; | ||
2754 | range.retry_flags = IW_RETRY_LIMIT; | ||
2755 | range.r_time_flags = IW_RETRY_LIFETIME; | ||
2756 | range.min_retry = 0; | ||
2757 | range.max_retry = 65535; /* ??? */ | ||
2758 | range.min_r_time = 0; | ||
2759 | range.max_r_time = 65535 * 1000; /* ??? */ | ||
2760 | |||
2761 | if (copy_to_user(rrq->pointer, &range, sizeof(range))) | ||
2762 | return -EFAULT; | ||
2763 | 2873 | ||
2764 | TRACE_EXIT(dev->name); | 2874 | TRACE_EXIT(dev->name); |
2765 | 2875 | ||
2766 | return 0; | 2876 | return 0; |
2767 | } | 2877 | } |
2768 | 2878 | ||
2769 | static int orinoco_ioctl_setiwencode(struct net_device *dev, struct iw_point *erq) | 2879 | static int orinoco_ioctl_setiwencode(struct net_device *dev, |
2880 | struct iw_request_info *info, | ||
2881 | struct iw_point *erq, | ||
2882 | char *keybuf) | ||
2770 | { | 2883 | { |
2771 | struct orinoco_private *priv = netdev_priv(dev); | 2884 | struct orinoco_private *priv = netdev_priv(dev); |
2772 | int index = (erq->flags & IW_ENCODE_INDEX) - 1; | 2885 | int index = (erq->flags & IW_ENCODE_INDEX) - 1; |
@@ -2774,8 +2887,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev, struct iw_point *er | |||
2774 | int enable = priv->wep_on; | 2887 | int enable = priv->wep_on; |
2775 | int restricted = priv->wep_restrict; | 2888 | int restricted = priv->wep_restrict; |
2776 | u16 xlen = 0; | 2889 | u16 xlen = 0; |
2777 | int err = 0; | 2890 | int err = -EINPROGRESS; /* Call commit handler */ |
2778 | char keybuf[ORINOCO_MAX_KEY_SIZE]; | ||
2779 | unsigned long flags; | 2891 | unsigned long flags; |
2780 | 2892 | ||
2781 | if (! priv->has_wep) | 2893 | if (! priv->has_wep) |
@@ -2788,9 +2900,6 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev, struct iw_point *er | |||
2788 | 2900 | ||
2789 | if ( (erq->length > SMALL_KEY_SIZE) && !priv->has_big_wep ) | 2901 | if ( (erq->length > SMALL_KEY_SIZE) && !priv->has_big_wep ) |
2790 | return -E2BIG; | 2902 | return -E2BIG; |
2791 | |||
2792 | if (copy_from_user(keybuf, erq->pointer, erq->length)) | ||
2793 | return -EFAULT; | ||
2794 | } | 2903 | } |
2795 | 2904 | ||
2796 | if (orinoco_lock(priv, &flags) != 0) | 2905 | if (orinoco_lock(priv, &flags) != 0) |
@@ -2864,12 +2973,14 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev, struct iw_point *er | |||
2864 | return err; | 2973 | return err; |
2865 | } | 2974 | } |
2866 | 2975 | ||
2867 | static int orinoco_ioctl_getiwencode(struct net_device *dev, struct iw_point *erq) | 2976 | static int orinoco_ioctl_getiwencode(struct net_device *dev, |
2977 | struct iw_request_info *info, | ||
2978 | struct iw_point *erq, | ||
2979 | char *keybuf) | ||
2868 | { | 2980 | { |
2869 | struct orinoco_private *priv = netdev_priv(dev); | 2981 | struct orinoco_private *priv = netdev_priv(dev); |
2870 | int index = (erq->flags & IW_ENCODE_INDEX) - 1; | 2982 | int index = (erq->flags & IW_ENCODE_INDEX) - 1; |
2871 | u16 xlen = 0; | 2983 | u16 xlen = 0; |
2872 | char keybuf[ORINOCO_MAX_KEY_SIZE]; | ||
2873 | unsigned long flags; | 2984 | unsigned long flags; |
2874 | 2985 | ||
2875 | if (! priv->has_wep) | 2986 | if (! priv->has_wep) |
@@ -2898,51 +3009,47 @@ static int orinoco_ioctl_getiwencode(struct net_device *dev, struct iw_point *er | |||
2898 | memcpy(keybuf, priv->keys[index].data, ORINOCO_MAX_KEY_SIZE); | 3009 | memcpy(keybuf, priv->keys[index].data, ORINOCO_MAX_KEY_SIZE); |
2899 | 3010 | ||
2900 | orinoco_unlock(priv, &flags); | 3011 | orinoco_unlock(priv, &flags); |
2901 | |||
2902 | if (erq->pointer) { | ||
2903 | if (copy_to_user(erq->pointer, keybuf, xlen)) | ||
2904 | return -EFAULT; | ||
2905 | } | ||
2906 | |||
2907 | return 0; | 3012 | return 0; |
2908 | } | 3013 | } |
2909 | 3014 | ||
2910 | static int orinoco_ioctl_setessid(struct net_device *dev, struct iw_point *erq) | 3015 | static int orinoco_ioctl_setessid(struct net_device *dev, |
3016 | struct iw_request_info *info, | ||
3017 | struct iw_point *erq, | ||
3018 | char *essidbuf) | ||
2911 | { | 3019 | { |
2912 | struct orinoco_private *priv = netdev_priv(dev); | 3020 | struct orinoco_private *priv = netdev_priv(dev); |
2913 | char essidbuf[IW_ESSID_MAX_SIZE+1]; | ||
2914 | unsigned long flags; | 3021 | unsigned long flags; |
2915 | 3022 | ||
2916 | /* Note : ESSID is ignored in Ad-Hoc demo mode, but we can set it | 3023 | /* Note : ESSID is ignored in Ad-Hoc demo mode, but we can set it |
2917 | * anyway... - Jean II */ | 3024 | * anyway... - Jean II */ |
2918 | 3025 | ||
2919 | memset(&essidbuf, 0, sizeof(essidbuf)); | 3026 | /* Hum... Should not use Wireless Extension constant (may change), |
2920 | 3027 | * should use our own... - Jean II */ | |
2921 | if (erq->flags) { | 3028 | if (erq->length > IW_ESSID_MAX_SIZE) |
2922 | /* iwconfig includes the NUL in the specified length */ | 3029 | return -E2BIG; |
2923 | if (erq->length > IW_ESSID_MAX_SIZE+1) | ||
2924 | return -E2BIG; | ||
2925 | |||
2926 | if (copy_from_user(&essidbuf, erq->pointer, erq->length)) | ||
2927 | return -EFAULT; | ||
2928 | |||
2929 | essidbuf[IW_ESSID_MAX_SIZE] = '\0'; | ||
2930 | } | ||
2931 | 3030 | ||
2932 | if (orinoco_lock(priv, &flags) != 0) | 3031 | if (orinoco_lock(priv, &flags) != 0) |
2933 | return -EBUSY; | 3032 | return -EBUSY; |
2934 | 3033 | ||
2935 | memcpy(priv->desired_essid, essidbuf, sizeof(priv->desired_essid)); | 3034 | /* NULL the string (for NULL termination & ESSID = ANY) - Jean II */ |
3035 | memset(priv->desired_essid, 0, sizeof(priv->desired_essid)); | ||
3036 | |||
3037 | /* If not ANY, get the new ESSID */ | ||
3038 | if (erq->flags) { | ||
3039 | memcpy(priv->desired_essid, essidbuf, erq->length); | ||
3040 | } | ||
2936 | 3041 | ||
2937 | orinoco_unlock(priv, &flags); | 3042 | orinoco_unlock(priv, &flags); |
2938 | 3043 | ||
2939 | return 0; | 3044 | return -EINPROGRESS; /* Call commit handler */ |
2940 | } | 3045 | } |
2941 | 3046 | ||
2942 | static int orinoco_ioctl_getessid(struct net_device *dev, struct iw_point *erq) | 3047 | static int orinoco_ioctl_getessid(struct net_device *dev, |
3048 | struct iw_request_info *info, | ||
3049 | struct iw_point *erq, | ||
3050 | char *essidbuf) | ||
2943 | { | 3051 | { |
2944 | struct orinoco_private *priv = netdev_priv(dev); | 3052 | struct orinoco_private *priv = netdev_priv(dev); |
2945 | char essidbuf[IW_ESSID_MAX_SIZE+1]; | ||
2946 | int active; | 3053 | int active; |
2947 | int err = 0; | 3054 | int err = 0; |
2948 | unsigned long flags; | 3055 | unsigned long flags; |
@@ -2956,51 +3063,46 @@ static int orinoco_ioctl_getessid(struct net_device *dev, struct iw_point *erq) | |||
2956 | } else { | 3063 | } else { |
2957 | if (orinoco_lock(priv, &flags) != 0) | 3064 | if (orinoco_lock(priv, &flags) != 0) |
2958 | return -EBUSY; | 3065 | return -EBUSY; |
2959 | memcpy(essidbuf, priv->desired_essid, sizeof(essidbuf)); | 3066 | memcpy(essidbuf, priv->desired_essid, IW_ESSID_MAX_SIZE + 1); |
2960 | orinoco_unlock(priv, &flags); | 3067 | orinoco_unlock(priv, &flags); |
2961 | } | 3068 | } |
2962 | 3069 | ||
2963 | erq->flags = 1; | 3070 | erq->flags = 1; |
2964 | erq->length = strlen(essidbuf) + 1; | 3071 | erq->length = strlen(essidbuf) + 1; |
2965 | if (erq->pointer) | ||
2966 | if (copy_to_user(erq->pointer, essidbuf, erq->length)) | ||
2967 | return -EFAULT; | ||
2968 | 3072 | ||
2969 | TRACE_EXIT(dev->name); | 3073 | TRACE_EXIT(dev->name); |
2970 | 3074 | ||
2971 | return 0; | 3075 | return 0; |
2972 | } | 3076 | } |
2973 | 3077 | ||
2974 | static int orinoco_ioctl_setnick(struct net_device *dev, struct iw_point *nrq) | 3078 | static int orinoco_ioctl_setnick(struct net_device *dev, |
3079 | struct iw_request_info *info, | ||
3080 | struct iw_point *nrq, | ||
3081 | char *nickbuf) | ||
2975 | { | 3082 | { |
2976 | struct orinoco_private *priv = netdev_priv(dev); | 3083 | struct orinoco_private *priv = netdev_priv(dev); |
2977 | char nickbuf[IW_ESSID_MAX_SIZE+1]; | ||
2978 | unsigned long flags; | 3084 | unsigned long flags; |
2979 | 3085 | ||
2980 | if (nrq->length > IW_ESSID_MAX_SIZE) | 3086 | if (nrq->length > IW_ESSID_MAX_SIZE) |
2981 | return -E2BIG; | 3087 | return -E2BIG; |
2982 | 3088 | ||
2983 | memset(nickbuf, 0, sizeof(nickbuf)); | ||
2984 | |||
2985 | if (copy_from_user(nickbuf, nrq->pointer, nrq->length)) | ||
2986 | return -EFAULT; | ||
2987 | |||
2988 | nickbuf[nrq->length] = '\0'; | ||
2989 | |||
2990 | if (orinoco_lock(priv, &flags) != 0) | 3089 | if (orinoco_lock(priv, &flags) != 0) |
2991 | return -EBUSY; | 3090 | return -EBUSY; |
2992 | 3091 | ||
2993 | memcpy(priv->nick, nickbuf, sizeof(priv->nick)); | 3092 | memset(priv->nick, 0, sizeof(priv->nick)); |
3093 | memcpy(priv->nick, nickbuf, nrq->length); | ||
2994 | 3094 | ||
2995 | orinoco_unlock(priv, &flags); | 3095 | orinoco_unlock(priv, &flags); |
2996 | 3096 | ||
2997 | return 0; | 3097 | return -EINPROGRESS; /* Call commit handler */ |
2998 | } | 3098 | } |
2999 | 3099 | ||
3000 | static int orinoco_ioctl_getnick(struct net_device *dev, struct iw_point *nrq) | 3100 | static int orinoco_ioctl_getnick(struct net_device *dev, |
3101 | struct iw_request_info *info, | ||
3102 | struct iw_point *nrq, | ||
3103 | char *nickbuf) | ||
3001 | { | 3104 | { |
3002 | struct orinoco_private *priv = netdev_priv(dev); | 3105 | struct orinoco_private *priv = netdev_priv(dev); |
3003 | char nickbuf[IW_ESSID_MAX_SIZE+1]; | ||
3004 | unsigned long flags; | 3106 | unsigned long flags; |
3005 | 3107 | ||
3006 | if (orinoco_lock(priv, &flags) != 0) | 3108 | if (orinoco_lock(priv, &flags) != 0) |
@@ -3011,23 +3113,22 @@ static int orinoco_ioctl_getnick(struct net_device *dev, struct iw_point *nrq) | |||
3011 | 3113 | ||
3012 | nrq->length = strlen(nickbuf)+1; | 3114 | nrq->length = strlen(nickbuf)+1; |
3013 | 3115 | ||
3014 | if (copy_to_user(nrq->pointer, nickbuf, sizeof(nickbuf))) | ||
3015 | return -EFAULT; | ||
3016 | |||
3017 | return 0; | 3116 | return 0; |
3018 | } | 3117 | } |
3019 | 3118 | ||
3020 | static int orinoco_ioctl_setfreq(struct net_device *dev, struct iw_freq *frq) | 3119 | static int orinoco_ioctl_setfreq(struct net_device *dev, |
3120 | struct iw_request_info *info, | ||
3121 | struct iw_freq *frq, | ||
3122 | char *extra) | ||
3021 | { | 3123 | { |
3022 | struct orinoco_private *priv = netdev_priv(dev); | 3124 | struct orinoco_private *priv = netdev_priv(dev); |
3023 | int chan = -1; | 3125 | int chan = -1; |
3024 | unsigned long flags; | 3126 | unsigned long flags; |
3127 | int err = -EINPROGRESS; /* Call commit handler */ | ||
3025 | 3128 | ||
3026 | /* We can only use this in Ad-Hoc demo mode to set the operating | 3129 | /* In infrastructure mode the AP sets the channel */ |
3027 | * frequency, or in IBSS mode to set the frequency where the IBSS | 3130 | if (priv->iw_mode == IW_MODE_INFRA) |
3028 | * will be created - Jean II */ | 3131 | return -EBUSY; |
3029 | if (priv->iw_mode != IW_MODE_ADHOC) | ||
3030 | return -EOPNOTSUPP; | ||
3031 | 3132 | ||
3032 | if ( (frq->e == 0) && (frq->m <= 1000) ) { | 3133 | if ( (frq->e == 0) && (frq->m <= 1000) ) { |
3033 | /* Setting by channel number */ | 3134 | /* Setting by channel number */ |
@@ -3051,13 +3152,44 @@ static int orinoco_ioctl_setfreq(struct net_device *dev, struct iw_freq *frq) | |||
3051 | 3152 | ||
3052 | if (orinoco_lock(priv, &flags) != 0) | 3153 | if (orinoco_lock(priv, &flags) != 0) |
3053 | return -EBUSY; | 3154 | return -EBUSY; |
3155 | |||
3054 | priv->channel = chan; | 3156 | priv->channel = chan; |
3157 | if (priv->iw_mode == IW_MODE_MONITOR) { | ||
3158 | /* Fast channel change - no commit if successful */ | ||
3159 | hermes_t *hw = &priv->hw; | ||
3160 | err = hermes_docmd_wait(hw, HERMES_CMD_TEST | | ||
3161 | HERMES_TEST_SET_CHANNEL, | ||
3162 | chan, NULL); | ||
3163 | } | ||
3055 | orinoco_unlock(priv, &flags); | 3164 | orinoco_unlock(priv, &flags); |
3056 | 3165 | ||
3166 | return err; | ||
3167 | } | ||
3168 | |||
3169 | static int orinoco_ioctl_getfreq(struct net_device *dev, | ||
3170 | struct iw_request_info *info, | ||
3171 | struct iw_freq *frq, | ||
3172 | char *extra) | ||
3173 | { | ||
3174 | struct orinoco_private *priv = netdev_priv(dev); | ||
3175 | int tmp; | ||
3176 | |||
3177 | /* Locking done in there */ | ||
3178 | tmp = orinoco_hw_get_freq(priv); | ||
3179 | if (tmp < 0) { | ||
3180 | return tmp; | ||
3181 | } | ||
3182 | |||
3183 | frq->m = tmp; | ||
3184 | frq->e = 1; | ||
3185 | |||
3057 | return 0; | 3186 | return 0; |
3058 | } | 3187 | } |
3059 | 3188 | ||
3060 | static int orinoco_ioctl_getsens(struct net_device *dev, struct iw_param *srq) | 3189 | static int orinoco_ioctl_getsens(struct net_device *dev, |
3190 | struct iw_request_info *info, | ||
3191 | struct iw_param *srq, | ||
3192 | char *extra) | ||
3061 | { | 3193 | { |
3062 | struct orinoco_private *priv = netdev_priv(dev); | 3194 | struct orinoco_private *priv = netdev_priv(dev); |
3063 | hermes_t *hw = &priv->hw; | 3195 | hermes_t *hw = &priv->hw; |
@@ -3083,7 +3215,10 @@ static int orinoco_ioctl_getsens(struct net_device *dev, struct iw_param *srq) | |||
3083 | return 0; | 3215 | return 0; |
3084 | } | 3216 | } |
3085 | 3217 | ||
3086 | static int orinoco_ioctl_setsens(struct net_device *dev, struct iw_param *srq) | 3218 | static int orinoco_ioctl_setsens(struct net_device *dev, |
3219 | struct iw_request_info *info, | ||
3220 | struct iw_param *srq, | ||
3221 | char *extra) | ||
3087 | { | 3222 | { |
3088 | struct orinoco_private *priv = netdev_priv(dev); | 3223 | struct orinoco_private *priv = netdev_priv(dev); |
3089 | int val = srq->value; | 3224 | int val = srq->value; |
@@ -3100,10 +3235,13 @@ static int orinoco_ioctl_setsens(struct net_device *dev, struct iw_param *srq) | |||
3100 | priv->ap_density = val; | 3235 | priv->ap_density = val; |
3101 | orinoco_unlock(priv, &flags); | 3236 | orinoco_unlock(priv, &flags); |
3102 | 3237 | ||
3103 | return 0; | 3238 | return -EINPROGRESS; /* Call commit handler */ |
3104 | } | 3239 | } |
3105 | 3240 | ||
3106 | static int orinoco_ioctl_setrts(struct net_device *dev, struct iw_param *rrq) | 3241 | static int orinoco_ioctl_setrts(struct net_device *dev, |
3242 | struct iw_request_info *info, | ||
3243 | struct iw_param *rrq, | ||
3244 | char *extra) | ||
3107 | { | 3245 | { |
3108 | struct orinoco_private *priv = netdev_priv(dev); | 3246 | struct orinoco_private *priv = netdev_priv(dev); |
3109 | int val = rrq->value; | 3247 | int val = rrq->value; |
@@ -3121,13 +3259,30 @@ static int orinoco_ioctl_setrts(struct net_device *dev, struct iw_param *rrq) | |||
3121 | priv->rts_thresh = val; | 3259 | priv->rts_thresh = val; |
3122 | orinoco_unlock(priv, &flags); | 3260 | orinoco_unlock(priv, &flags); |
3123 | 3261 | ||
3262 | return -EINPROGRESS; /* Call commit handler */ | ||
3263 | } | ||
3264 | |||
3265 | static int orinoco_ioctl_getrts(struct net_device *dev, | ||
3266 | struct iw_request_info *info, | ||
3267 | struct iw_param *rrq, | ||
3268 | char *extra) | ||
3269 | { | ||
3270 | struct orinoco_private *priv = netdev_priv(dev); | ||
3271 | |||
3272 | rrq->value = priv->rts_thresh; | ||
3273 | rrq->disabled = (rrq->value == 2347); | ||
3274 | rrq->fixed = 1; | ||
3275 | |||
3124 | return 0; | 3276 | return 0; |
3125 | } | 3277 | } |
3126 | 3278 | ||
3127 | static int orinoco_ioctl_setfrag(struct net_device *dev, struct iw_param *frq) | 3279 | static int orinoco_ioctl_setfrag(struct net_device *dev, |
3280 | struct iw_request_info *info, | ||
3281 | struct iw_param *frq, | ||
3282 | char *extra) | ||
3128 | { | 3283 | { |
3129 | struct orinoco_private *priv = netdev_priv(dev); | 3284 | struct orinoco_private *priv = netdev_priv(dev); |
3130 | int err = 0; | 3285 | int err = -EINPROGRESS; /* Call commit handler */ |
3131 | unsigned long flags; | 3286 | unsigned long flags; |
3132 | 3287 | ||
3133 | if (orinoco_lock(priv, &flags) != 0) | 3288 | if (orinoco_lock(priv, &flags) != 0) |
@@ -3159,11 +3314,14 @@ static int orinoco_ioctl_setfrag(struct net_device *dev, struct iw_param *frq) | |||
3159 | return err; | 3314 | return err; |
3160 | } | 3315 | } |
3161 | 3316 | ||
3162 | static int orinoco_ioctl_getfrag(struct net_device *dev, struct iw_param *frq) | 3317 | static int orinoco_ioctl_getfrag(struct net_device *dev, |
3318 | struct iw_request_info *info, | ||
3319 | struct iw_param *frq, | ||
3320 | char *extra) | ||
3163 | { | 3321 | { |
3164 | struct orinoco_private *priv = netdev_priv(dev); | 3322 | struct orinoco_private *priv = netdev_priv(dev); |
3165 | hermes_t *hw = &priv->hw; | 3323 | hermes_t *hw = &priv->hw; |
3166 | int err = 0; | 3324 | int err; |
3167 | u16 val; | 3325 | u16 val; |
3168 | unsigned long flags; | 3326 | unsigned long flags; |
3169 | 3327 | ||
@@ -3196,10 +3354,12 @@ static int orinoco_ioctl_getfrag(struct net_device *dev, struct iw_param *frq) | |||
3196 | return err; | 3354 | return err; |
3197 | } | 3355 | } |
3198 | 3356 | ||
3199 | static int orinoco_ioctl_setrate(struct net_device *dev, struct iw_param *rrq) | 3357 | static int orinoco_ioctl_setrate(struct net_device *dev, |
3358 | struct iw_request_info *info, | ||
3359 | struct iw_param *rrq, | ||
3360 | char *extra) | ||
3200 | { | 3361 | { |
3201 | struct orinoco_private *priv = netdev_priv(dev); | 3362 | struct orinoco_private *priv = netdev_priv(dev); |
3202 | int err = 0; | ||
3203 | int ratemode = -1; | 3363 | int ratemode = -1; |
3204 | int bitrate; /* 100s of kilobits */ | 3364 | int bitrate; /* 100s of kilobits */ |
3205 | int i; | 3365 | int i; |
@@ -3235,10 +3395,13 @@ static int orinoco_ioctl_setrate(struct net_device *dev, struct iw_param *rrq) | |||
3235 | priv->bitratemode = ratemode; | 3395 | priv->bitratemode = ratemode; |
3236 | orinoco_unlock(priv, &flags); | 3396 | orinoco_unlock(priv, &flags); |
3237 | 3397 | ||
3238 | return err; | 3398 | return -EINPROGRESS; |
3239 | } | 3399 | } |
3240 | 3400 | ||
3241 | static int orinoco_ioctl_getrate(struct net_device *dev, struct iw_param *rrq) | 3401 | static int orinoco_ioctl_getrate(struct net_device *dev, |
3402 | struct iw_request_info *info, | ||
3403 | struct iw_param *rrq, | ||
3404 | char *extra) | ||
3242 | { | 3405 | { |
3243 | struct orinoco_private *priv = netdev_priv(dev); | 3406 | struct orinoco_private *priv = netdev_priv(dev); |
3244 | hermes_t *hw = &priv->hw; | 3407 | hermes_t *hw = &priv->hw; |
@@ -3303,10 +3466,13 @@ static int orinoco_ioctl_getrate(struct net_device *dev, struct iw_param *rrq) | |||
3303 | return err; | 3466 | return err; |
3304 | } | 3467 | } |
3305 | 3468 | ||
3306 | static int orinoco_ioctl_setpower(struct net_device *dev, struct iw_param *prq) | 3469 | static int orinoco_ioctl_setpower(struct net_device *dev, |
3470 | struct iw_request_info *info, | ||
3471 | struct iw_param *prq, | ||
3472 | char *extra) | ||
3307 | { | 3473 | { |
3308 | struct orinoco_private *priv = netdev_priv(dev); | 3474 | struct orinoco_private *priv = netdev_priv(dev); |
3309 | int err = 0; | 3475 | int err = -EINPROGRESS; /* Call commit handler */ |
3310 | unsigned long flags; | 3476 | unsigned long flags; |
3311 | 3477 | ||
3312 | if (orinoco_lock(priv, &flags) != 0) | 3478 | if (orinoco_lock(priv, &flags) != 0) |
@@ -3355,7 +3521,10 @@ static int orinoco_ioctl_setpower(struct net_device *dev, struct iw_param *prq) | |||
3355 | return err; | 3521 | return err; |
3356 | } | 3522 | } |
3357 | 3523 | ||
3358 | static int orinoco_ioctl_getpower(struct net_device *dev, struct iw_param *prq) | 3524 | static int orinoco_ioctl_getpower(struct net_device *dev, |
3525 | struct iw_request_info *info, | ||
3526 | struct iw_param *prq, | ||
3527 | char *extra) | ||
3359 | { | 3528 | { |
3360 | struct orinoco_private *priv = netdev_priv(dev); | 3529 | struct orinoco_private *priv = netdev_priv(dev); |
3361 | hermes_t *hw = &priv->hw; | 3530 | hermes_t *hw = &priv->hw; |
@@ -3403,7 +3572,10 @@ static int orinoco_ioctl_getpower(struct net_device *dev, struct iw_param *prq) | |||
3403 | return err; | 3572 | return err; |
3404 | } | 3573 | } |
3405 | 3574 | ||
3406 | static int orinoco_ioctl_getretry(struct net_device *dev, struct iw_param *rrq) | 3575 | static int orinoco_ioctl_getretry(struct net_device *dev, |
3576 | struct iw_request_info *info, | ||
3577 | struct iw_param *rrq, | ||
3578 | char *extra) | ||
3407 | { | 3579 | { |
3408 | struct orinoco_private *priv = netdev_priv(dev); | 3580 | struct orinoco_private *priv = netdev_priv(dev); |
3409 | hermes_t *hw = &priv->hw; | 3581 | hermes_t *hw = &priv->hw; |
@@ -3454,10 +3626,38 @@ static int orinoco_ioctl_getretry(struct net_device *dev, struct iw_param *rrq) | |||
3454 | return err; | 3626 | return err; |
3455 | } | 3627 | } |
3456 | 3628 | ||
3457 | static int orinoco_ioctl_setibssport(struct net_device *dev, struct iwreq *wrq) | 3629 | static int orinoco_ioctl_reset(struct net_device *dev, |
3630 | struct iw_request_info *info, | ||
3631 | void *wrqu, | ||
3632 | char *extra) | ||
3458 | { | 3633 | { |
3459 | struct orinoco_private *priv = netdev_priv(dev); | 3634 | struct orinoco_private *priv = netdev_priv(dev); |
3460 | int val = *( (int *) wrq->u.name ); | 3635 | |
3636 | if (! capable(CAP_NET_ADMIN)) | ||
3637 | return -EPERM; | ||
3638 | |||
3639 | if (info->cmd == (SIOCIWFIRSTPRIV + 0x1)) { | ||
3640 | printk(KERN_DEBUG "%s: Forcing reset!\n", dev->name); | ||
3641 | |||
3642 | /* Firmware reset */ | ||
3643 | orinoco_reset(dev); | ||
3644 | } else { | ||
3645 | printk(KERN_DEBUG "%s: Force scheduling reset!\n", dev->name); | ||
3646 | |||
3647 | schedule_work(&priv->reset_work); | ||
3648 | } | ||
3649 | |||
3650 | return 0; | ||
3651 | } | ||
3652 | |||
3653 | static int orinoco_ioctl_setibssport(struct net_device *dev, | ||
3654 | struct iw_request_info *info, | ||
3655 | void *wrqu, | ||
3656 | char *extra) | ||
3657 | |||
3658 | { | ||
3659 | struct orinoco_private *priv = netdev_priv(dev); | ||
3660 | int val = *( (int *) extra ); | ||
3461 | unsigned long flags; | 3661 | unsigned long flags; |
3462 | 3662 | ||
3463 | if (orinoco_lock(priv, &flags) != 0) | 3663 | if (orinoco_lock(priv, &flags) != 0) |
@@ -3469,28 +3669,28 @@ static int orinoco_ioctl_setibssport(struct net_device *dev, struct iwreq *wrq) | |||
3469 | set_port_type(priv); | 3669 | set_port_type(priv); |
3470 | 3670 | ||
3471 | orinoco_unlock(priv, &flags); | 3671 | orinoco_unlock(priv, &flags); |
3472 | return 0; | 3672 | return -EINPROGRESS; /* Call commit handler */ |
3473 | } | 3673 | } |
3474 | 3674 | ||
3475 | static int orinoco_ioctl_getibssport(struct net_device *dev, struct iwreq *wrq) | 3675 | static int orinoco_ioctl_getibssport(struct net_device *dev, |
3676 | struct iw_request_info *info, | ||
3677 | void *wrqu, | ||
3678 | char *extra) | ||
3476 | { | 3679 | { |
3477 | struct orinoco_private *priv = netdev_priv(dev); | 3680 | struct orinoco_private *priv = netdev_priv(dev); |
3478 | int *val = (int *)wrq->u.name; | 3681 | int *val = (int *) extra; |
3479 | unsigned long flags; | ||
3480 | |||
3481 | if (orinoco_lock(priv, &flags) != 0) | ||
3482 | return -EBUSY; | ||
3483 | 3682 | ||
3484 | *val = priv->ibss_port; | 3683 | *val = priv->ibss_port; |
3485 | orinoco_unlock(priv, &flags); | ||
3486 | |||
3487 | return 0; | 3684 | return 0; |
3488 | } | 3685 | } |
3489 | 3686 | ||
3490 | static int orinoco_ioctl_setport3(struct net_device *dev, struct iwreq *wrq) | 3687 | static int orinoco_ioctl_setport3(struct net_device *dev, |
3688 | struct iw_request_info *info, | ||
3689 | void *wrqu, | ||
3690 | char *extra) | ||
3491 | { | 3691 | { |
3492 | struct orinoco_private *priv = netdev_priv(dev); | 3692 | struct orinoco_private *priv = netdev_priv(dev); |
3493 | int val = *( (int *) wrq->u.name ); | 3693 | int val = *( (int *) extra ); |
3494 | int err = 0; | 3694 | int err = 0; |
3495 | unsigned long flags; | 3695 | unsigned long flags; |
3496 | 3696 | ||
@@ -3519,51 +3719,131 @@ static int orinoco_ioctl_setport3(struct net_device *dev, struct iwreq *wrq) | |||
3519 | err = -EINVAL; | 3719 | err = -EINVAL; |
3520 | } | 3720 | } |
3521 | 3721 | ||
3522 | if (! err) | 3722 | if (! err) { |
3523 | /* Actually update the mode we are using */ | 3723 | /* Actually update the mode we are using */ |
3524 | set_port_type(priv); | 3724 | set_port_type(priv); |
3725 | err = -EINPROGRESS; | ||
3726 | } | ||
3525 | 3727 | ||
3526 | orinoco_unlock(priv, &flags); | 3728 | orinoco_unlock(priv, &flags); |
3527 | 3729 | ||
3528 | return err; | 3730 | return err; |
3529 | } | 3731 | } |
3530 | 3732 | ||
3531 | static int orinoco_ioctl_getport3(struct net_device *dev, struct iwreq *wrq) | 3733 | static int orinoco_ioctl_getport3(struct net_device *dev, |
3734 | struct iw_request_info *info, | ||
3735 | void *wrqu, | ||
3736 | char *extra) | ||
3737 | { | ||
3738 | struct orinoco_private *priv = netdev_priv(dev); | ||
3739 | int *val = (int *) extra; | ||
3740 | |||
3741 | *val = priv->prefer_port3; | ||
3742 | return 0; | ||
3743 | } | ||
3744 | |||
3745 | static int orinoco_ioctl_setpreamble(struct net_device *dev, | ||
3746 | struct iw_request_info *info, | ||
3747 | void *wrqu, | ||
3748 | char *extra) | ||
3532 | { | 3749 | { |
3533 | struct orinoco_private *priv = netdev_priv(dev); | 3750 | struct orinoco_private *priv = netdev_priv(dev); |
3534 | int *val = (int *)wrq->u.name; | ||
3535 | unsigned long flags; | 3751 | unsigned long flags; |
3752 | int val; | ||
3753 | |||
3754 | if (! priv->has_preamble) | ||
3755 | return -EOPNOTSUPP; | ||
3756 | |||
3757 | /* 802.11b has recently defined some short preamble. | ||
3758 | * Basically, the Phy header has been reduced in size. | ||
3759 | * This increase performance, especially at high rates | ||
3760 | * (the preamble is transmitted at 1Mb/s), unfortunately | ||
3761 | * this give compatibility troubles... - Jean II */ | ||
3762 | val = *( (int *) extra ); | ||
3536 | 3763 | ||
3537 | if (orinoco_lock(priv, &flags) != 0) | 3764 | if (orinoco_lock(priv, &flags) != 0) |
3538 | return -EBUSY; | 3765 | return -EBUSY; |
3539 | 3766 | ||
3540 | *val = priv->prefer_port3; | 3767 | if (val) |
3768 | priv->preamble = 1; | ||
3769 | else | ||
3770 | priv->preamble = 0; | ||
3771 | |||
3541 | orinoco_unlock(priv, &flags); | 3772 | orinoco_unlock(priv, &flags); |
3773 | |||
3774 | return -EINPROGRESS; /* Call commit handler */ | ||
3775 | } | ||
3776 | |||
3777 | static int orinoco_ioctl_getpreamble(struct net_device *dev, | ||
3778 | struct iw_request_info *info, | ||
3779 | void *wrqu, | ||
3780 | char *extra) | ||
3781 | { | ||
3782 | struct orinoco_private *priv = netdev_priv(dev); | ||
3783 | int *val = (int *) extra; | ||
3784 | |||
3785 | if (! priv->has_preamble) | ||
3786 | return -EOPNOTSUPP; | ||
3787 | |||
3788 | *val = priv->preamble; | ||
3542 | return 0; | 3789 | return 0; |
3543 | } | 3790 | } |
3544 | 3791 | ||
3792 | /* ioctl interface to hermes_read_ltv() | ||
3793 | * To use with iwpriv, pass the RID as the token argument, e.g. | ||
3794 | * iwpriv get_rid [0xfc00] | ||
3795 | * At least Wireless Tools 25 is required to use iwpriv. | ||
3796 | * For Wireless Tools 25 and 26 append "dummy" are the end. */ | ||
3797 | static int orinoco_ioctl_getrid(struct net_device *dev, | ||
3798 | struct iw_request_info *info, | ||
3799 | struct iw_point *data, | ||
3800 | char *extra) | ||
3801 | { | ||
3802 | struct orinoco_private *priv = netdev_priv(dev); | ||
3803 | hermes_t *hw = &priv->hw; | ||
3804 | int rid = data->flags; | ||
3805 | u16 length; | ||
3806 | int err; | ||
3807 | unsigned long flags; | ||
3808 | |||
3809 | /* It's a "get" function, but we don't want users to access the | ||
3810 | * WEP key and other raw firmware data */ | ||
3811 | if (! capable(CAP_NET_ADMIN)) | ||
3812 | return -EPERM; | ||
3813 | |||
3814 | if (rid < 0xfc00 || rid > 0xffff) | ||
3815 | return -EINVAL; | ||
3816 | |||
3817 | if (orinoco_lock(priv, &flags) != 0) | ||
3818 | return -EBUSY; | ||
3819 | |||
3820 | err = hermes_read_ltv(hw, USER_BAP, rid, MAX_RID_LEN, &length, | ||
3821 | extra); | ||
3822 | if (err) | ||
3823 | goto out; | ||
3824 | |||
3825 | data->length = min_t(u16, HERMES_RECLEN_TO_BYTES(length), | ||
3826 | MAX_RID_LEN); | ||
3827 | |||
3828 | out: | ||
3829 | orinoco_unlock(priv, &flags); | ||
3830 | return err; | ||
3831 | } | ||
3832 | |||
3545 | /* Spy is used for link quality/strength measurements in Ad-Hoc mode | 3833 | /* Spy is used for link quality/strength measurements in Ad-Hoc mode |
3546 | * Jean II */ | 3834 | * Jean II */ |
3547 | static int orinoco_ioctl_setspy(struct net_device *dev, struct iw_point *srq) | 3835 | static int orinoco_ioctl_setspy(struct net_device *dev, |
3836 | struct iw_request_info *info, | ||
3837 | struct iw_point *srq, | ||
3838 | char *extra) | ||
3839 | |||
3548 | { | 3840 | { |
3549 | struct orinoco_private *priv = netdev_priv(dev); | 3841 | struct orinoco_private *priv = netdev_priv(dev); |
3550 | struct sockaddr address[IW_MAX_SPY]; | 3842 | struct sockaddr *address = (struct sockaddr *) extra; |
3551 | int number = srq->length; | 3843 | int number = srq->length; |
3552 | int i; | 3844 | int i; |
3553 | int err = 0; | ||
3554 | unsigned long flags; | 3845 | unsigned long flags; |
3555 | 3846 | ||
3556 | /* Check the number of addresses */ | ||
3557 | if (number > IW_MAX_SPY) | ||
3558 | return -E2BIG; | ||
3559 | |||
3560 | /* Get the data in the driver */ | ||
3561 | if (srq->pointer) { | ||
3562 | if (copy_from_user(address, srq->pointer, | ||
3563 | sizeof(struct sockaddr) * number)) | ||
3564 | return -EFAULT; | ||
3565 | } | ||
3566 | |||
3567 | /* Make sure nobody mess with the structure while we do */ | 3847 | /* Make sure nobody mess with the structure while we do */ |
3568 | if (orinoco_lock(priv, &flags) != 0) | 3848 | if (orinoco_lock(priv, &flags) != 0) |
3569 | return -EBUSY; | 3849 | return -EBUSY; |
@@ -3587,14 +3867,17 @@ static int orinoco_ioctl_setspy(struct net_device *dev, struct iw_point *srq) | |||
3587 | /* Now, let the others play */ | 3867 | /* Now, let the others play */ |
3588 | orinoco_unlock(priv, &flags); | 3868 | orinoco_unlock(priv, &flags); |
3589 | 3869 | ||
3590 | return err; | 3870 | /* Do NOT call commit handler */ |
3871 | return 0; | ||
3591 | } | 3872 | } |
3592 | 3873 | ||
3593 | static int orinoco_ioctl_getspy(struct net_device *dev, struct iw_point *srq) | 3874 | static int orinoco_ioctl_getspy(struct net_device *dev, |
3875 | struct iw_request_info *info, | ||
3876 | struct iw_point *srq, | ||
3877 | char *extra) | ||
3594 | { | 3878 | { |
3595 | struct orinoco_private *priv = netdev_priv(dev); | 3879 | struct orinoco_private *priv = netdev_priv(dev); |
3596 | struct sockaddr address[IW_MAX_SPY]; | 3880 | struct sockaddr *address = (struct sockaddr *) extra; |
3597 | struct iw_quality spy_stat[IW_MAX_SPY]; | ||
3598 | int number; | 3881 | int number; |
3599 | int i; | 3882 | int i; |
3600 | unsigned long flags; | 3883 | unsigned long flags; |
@@ -3603,7 +3886,12 @@ static int orinoco_ioctl_getspy(struct net_device *dev, struct iw_point *srq) | |||
3603 | return -EBUSY; | 3886 | return -EBUSY; |
3604 | 3887 | ||
3605 | number = priv->spy_number; | 3888 | number = priv->spy_number; |
3606 | if ((number > 0) && (srq->pointer)) { | 3889 | /* Create address struct */ |
3890 | for (i = 0; i < number; i++) { | ||
3891 | memcpy(address[i].sa_data, priv->spy_address[i], ETH_ALEN); | ||
3892 | address[i].sa_family = AF_UNIX; | ||
3893 | } | ||
3894 | if (number > 0) { | ||
3607 | /* Create address struct */ | 3895 | /* Create address struct */ |
3608 | for (i = 0; i < number; i++) { | 3896 | for (i = 0; i < number; i++) { |
3609 | memcpy(address[i].sa_data, priv->spy_address[i], | 3897 | memcpy(address[i].sa_data, priv->spy_address[i], |
@@ -3614,344 +3902,503 @@ static int orinoco_ioctl_getspy(struct net_device *dev, struct iw_point *srq) | |||
3614 | /* In theory, we should disable irqs while copying the stats | 3902 | /* In theory, we should disable irqs while copying the stats |
3615 | * because the rx path might update it in the middle... | 3903 | * because the rx path might update it in the middle... |
3616 | * Bah, who care ? - Jean II */ | 3904 | * Bah, who care ? - Jean II */ |
3617 | memcpy(&spy_stat, priv->spy_stat, | 3905 | memcpy(extra + (sizeof(struct sockaddr) * number), |
3618 | sizeof(struct iw_quality) * IW_MAX_SPY); | 3906 | priv->spy_stat, sizeof(struct iw_quality) * number); |
3619 | for (i=0; i < number; i++) | ||
3620 | priv->spy_stat[i].updated = 0; | ||
3621 | } | 3907 | } |
3908 | /* Reset updated flags. */ | ||
3909 | for (i = 0; i < number; i++) | ||
3910 | priv->spy_stat[i].updated = 0; | ||
3622 | 3911 | ||
3623 | orinoco_unlock(priv, &flags); | 3912 | orinoco_unlock(priv, &flags); |
3624 | 3913 | ||
3625 | /* Push stuff to user space */ | ||
3626 | srq->length = number; | 3914 | srq->length = number; |
3627 | if(copy_to_user(srq->pointer, address, | ||
3628 | sizeof(struct sockaddr) * number)) | ||
3629 | return -EFAULT; | ||
3630 | if(copy_to_user(srq->pointer + (sizeof(struct sockaddr)*number), | ||
3631 | &spy_stat, sizeof(struct iw_quality) * number)) | ||
3632 | return -EFAULT; | ||
3633 | 3915 | ||
3634 | return 0; | 3916 | return 0; |
3635 | } | 3917 | } |
3636 | 3918 | ||
3637 | static int | 3919 | /* Trigger a scan (look for other cells in the vicinity */ |
3638 | orinoco_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | 3920 | static int orinoco_ioctl_setscan(struct net_device *dev, |
3921 | struct iw_request_info *info, | ||
3922 | struct iw_param *srq, | ||
3923 | char *extra) | ||
3639 | { | 3924 | { |
3640 | struct orinoco_private *priv = netdev_priv(dev); | 3925 | struct orinoco_private *priv = netdev_priv(dev); |
3641 | struct iwreq *wrq = (struct iwreq *)rq; | 3926 | hermes_t *hw = &priv->hw; |
3642 | int err = 0; | 3927 | int err = 0; |
3643 | int tmp; | ||
3644 | int changed = 0; | ||
3645 | unsigned long flags; | 3928 | unsigned long flags; |
3646 | 3929 | ||
3647 | TRACE_ENTER(dev->name); | 3930 | /* Note : you may have realised that, as this is a SET operation, |
3931 | * this is priviledged and therefore a normal user can't | ||
3932 | * perform scanning. | ||
3933 | * This is not an error, while the device perform scanning, | ||
3934 | * traffic doesn't flow, so it's a perfect DoS... | ||
3935 | * Jean II */ | ||
3648 | 3936 | ||
3649 | /* In theory, we could allow most of the the SET stuff to be | 3937 | if (orinoco_lock(priv, &flags) != 0) |
3650 | * done. In practice, the lapse of time at startup when the | 3938 | return -EBUSY; |
3651 | * card is not ready is very short, so why bother... Note | ||
3652 | * that netif_device_present is different from up/down | ||
3653 | * (ifconfig), when the device is not yet up, it is usually | ||
3654 | * already ready... Jean II */ | ||
3655 | if (! netif_device_present(dev)) | ||
3656 | return -ENODEV; | ||
3657 | 3939 | ||
3658 | switch (cmd) { | 3940 | /* Scanning with port 0 disabled would fail */ |
3659 | case SIOCGIWNAME: | 3941 | if (!netif_running(dev)) { |
3660 | strcpy(wrq->u.name, "IEEE 802.11-DS"); | 3942 | err = -ENETDOWN; |
3661 | break; | 3943 | goto out; |
3662 | 3944 | } | |
3663 | case SIOCGIWAP: | ||
3664 | wrq->u.ap_addr.sa_family = ARPHRD_ETHER; | ||
3665 | err = orinoco_hw_get_bssid(priv, wrq->u.ap_addr.sa_data); | ||
3666 | break; | ||
3667 | 3945 | ||
3668 | case SIOCGIWRANGE: | 3946 | /* In monitor mode, the scan results are always empty. |
3669 | err = orinoco_ioctl_getiwrange(dev, &wrq->u.data); | 3947 | * Probe responses are passed to the driver as received |
3670 | break; | 3948 | * frames and could be processed in software. */ |
3949 | if (priv->iw_mode == IW_MODE_MONITOR) { | ||
3950 | err = -EOPNOTSUPP; | ||
3951 | goto out; | ||
3952 | } | ||
3671 | 3953 | ||
3672 | case SIOCSIWMODE: | 3954 | /* Note : because we don't lock out the irq handler, the way |
3673 | if (orinoco_lock(priv, &flags) != 0) | 3955 | * we access scan variables in priv is critical. |
3674 | return -EBUSY; | 3956 | * o scan_inprogress : not touched by irq handler |
3675 | switch (wrq->u.mode) { | 3957 | * o scan_mode : not touched by irq handler |
3676 | case IW_MODE_ADHOC: | 3958 | * o scan_result : irq is strict producer, non-irq is strict |
3677 | if (! (priv->has_ibss || priv->has_port3) ) | 3959 | * consumer. |
3678 | err = -EINVAL; | 3960 | * o scan_len : synchronised with scan_result |
3679 | else { | 3961 | * Before modifying anything on those variables, please think hard ! |
3680 | priv->iw_mode = IW_MODE_ADHOC; | 3962 | * Jean II */ |
3681 | changed = 1; | ||
3682 | } | ||
3683 | break; | ||
3684 | 3963 | ||
3685 | case IW_MODE_INFRA: | 3964 | /* If there is still some left-over scan results, get rid of it */ |
3686 | priv->iw_mode = IW_MODE_INFRA; | 3965 | if (priv->scan_result != NULL) { |
3687 | changed = 1; | 3966 | /* What's likely is that a client did crash or was killed |
3688 | break; | 3967 | * between triggering the scan request and reading the |
3968 | * results, so we need to reset everything. | ||
3969 | * Some clients that are too slow may suffer from that... | ||
3970 | * Jean II */ | ||
3971 | kfree(priv->scan_result); | ||
3972 | priv->scan_result = NULL; | ||
3973 | } | ||
3689 | 3974 | ||
3690 | default: | 3975 | /* Save flags */ |
3691 | err = -EINVAL; | 3976 | priv->scan_mode = srq->flags; |
3692 | break; | ||
3693 | } | ||
3694 | set_port_type(priv); | ||
3695 | orinoco_unlock(priv, &flags); | ||
3696 | break; | ||
3697 | 3977 | ||
3698 | case SIOCGIWMODE: | 3978 | /* Always trigger scanning, even if it's in progress. |
3699 | if (orinoco_lock(priv, &flags) != 0) | 3979 | * This way, if the info frame get lost, we will recover somewhat |
3700 | return -EBUSY; | 3980 | * gracefully - Jean II */ |
3701 | wrq->u.mode = priv->iw_mode; | ||
3702 | orinoco_unlock(priv, &flags); | ||
3703 | break; | ||
3704 | 3981 | ||
3705 | case SIOCSIWENCODE: | 3982 | if (priv->has_hostscan) { |
3706 | err = orinoco_ioctl_setiwencode(dev, &wrq->u.encoding); | 3983 | switch (priv->firmware_type) { |
3707 | if (! err) | 3984 | case FIRMWARE_TYPE_SYMBOL: |
3708 | changed = 1; | 3985 | err = hermes_write_wordrec(hw, USER_BAP, |
3986 | HERMES_RID_CNFHOSTSCAN_SYMBOL, | ||
3987 | HERMES_HOSTSCAN_SYMBOL_ONCE | | ||
3988 | HERMES_HOSTSCAN_SYMBOL_BCAST); | ||
3989 | break; | ||
3990 | case FIRMWARE_TYPE_INTERSIL: { | ||
3991 | u16 req[3]; | ||
3992 | |||
3993 | req[0] = cpu_to_le16(0x3fff); /* All channels */ | ||
3994 | req[1] = cpu_to_le16(0x0001); /* rate 1 Mbps */ | ||
3995 | req[2] = 0; /* Any ESSID */ | ||
3996 | err = HERMES_WRITE_RECORD(hw, USER_BAP, | ||
3997 | HERMES_RID_CNFHOSTSCAN, &req); | ||
3998 | } | ||
3709 | break; | 3999 | break; |
4000 | case FIRMWARE_TYPE_AGERE: | ||
4001 | err = hermes_write_wordrec(hw, USER_BAP, | ||
4002 | HERMES_RID_CNFSCANSSID_AGERE, | ||
4003 | 0); /* Any ESSID */ | ||
4004 | if (err) | ||
4005 | break; | ||
3710 | 4006 | ||
3711 | case SIOCGIWENCODE: | 4007 | err = hermes_inquire(hw, HERMES_INQ_SCAN); |
3712 | if (! capable(CAP_NET_ADMIN)) { | ||
3713 | err = -EPERM; | ||
3714 | break; | 4008 | break; |
3715 | } | 4009 | } |
4010 | } else | ||
4011 | err = hermes_inquire(hw, HERMES_INQ_SCAN); | ||
3716 | 4012 | ||
3717 | err = orinoco_ioctl_getiwencode(dev, &wrq->u.encoding); | 4013 | /* One more client */ |
3718 | break; | 4014 | if (! err) |
3719 | 4015 | priv->scan_inprogress = 1; | |
3720 | case SIOCSIWESSID: | ||
3721 | err = orinoco_ioctl_setessid(dev, &wrq->u.essid); | ||
3722 | if (! err) | ||
3723 | changed = 1; | ||
3724 | break; | ||
3725 | 4016 | ||
3726 | case SIOCGIWESSID: | 4017 | out: |
3727 | err = orinoco_ioctl_getessid(dev, &wrq->u.essid); | 4018 | orinoco_unlock(priv, &flags); |
3728 | break; | 4019 | return err; |
4020 | } | ||
3729 | 4021 | ||
3730 | case SIOCSIWNICKN: | 4022 | /* Translate scan data returned from the card to a card independant |
3731 | err = orinoco_ioctl_setnick(dev, &wrq->u.data); | 4023 | * format that the Wireless Tools will understand - Jean II */ |
3732 | if (! err) | 4024 | static inline int orinoco_translate_scan(struct net_device *dev, |
3733 | changed = 1; | 4025 | char *buffer, |
3734 | break; | 4026 | char *scan, |
4027 | int scan_len) | ||
4028 | { | ||
4029 | struct orinoco_private *priv = netdev_priv(dev); | ||
4030 | int offset; /* In the scan data */ | ||
4031 | union hermes_scan_info *atom; | ||
4032 | int atom_len; | ||
4033 | u16 capabilities; | ||
4034 | u16 channel; | ||
4035 | struct iw_event iwe; /* Temporary buffer */ | ||
4036 | char * current_ev = buffer; | ||
4037 | char * end_buf = buffer + IW_SCAN_MAX_DATA; | ||
3735 | 4038 | ||
3736 | case SIOCGIWNICKN: | 4039 | switch (priv->firmware_type) { |
3737 | err = orinoco_ioctl_getnick(dev, &wrq->u.data); | 4040 | case FIRMWARE_TYPE_AGERE: |
4041 | atom_len = sizeof(struct agere_scan_apinfo); | ||
4042 | offset = 0; | ||
3738 | break; | 4043 | break; |
3739 | 4044 | case FIRMWARE_TYPE_SYMBOL: | |
3740 | case SIOCGIWFREQ: | 4045 | /* Lack of documentation necessitates this hack. |
3741 | tmp = orinoco_hw_get_freq(priv); | 4046 | * Different firmwares have 68 or 76 byte long atoms. |
3742 | if (tmp < 0) { | 4047 | * We try modulo first. If the length divides by both, |
3743 | err = tmp; | 4048 | * we check what would be the channel in the second |
3744 | } else { | 4049 | * frame for a 68-byte atom. 76-byte atoms have 0 there. |
3745 | wrq->u.freq.m = tmp; | 4050 | * Valid channel cannot be 0. */ |
3746 | wrq->u.freq.e = 1; | 4051 | if (scan_len % 76) |
3747 | } | 4052 | atom_len = 68; |
4053 | else if (scan_len % 68) | ||
4054 | atom_len = 76; | ||
4055 | else if (scan_len >= 1292 && scan[68] == 0) | ||
4056 | atom_len = 76; | ||
4057 | else | ||
4058 | atom_len = 68; | ||
4059 | offset = 0; | ||
3748 | break; | 4060 | break; |
3749 | 4061 | case FIRMWARE_TYPE_INTERSIL: | |
3750 | case SIOCSIWFREQ: | 4062 | offset = 4; |
3751 | err = orinoco_ioctl_setfreq(dev, &wrq->u.freq); | 4063 | if (priv->has_hostscan) |
3752 | if (! err) | 4064 | atom_len = scan[0] + (scan[1] << 8); |
3753 | changed = 1; | 4065 | else |
4066 | atom_len = offsetof(struct prism2_scan_apinfo, atim); | ||
3754 | break; | 4067 | break; |
4068 | default: | ||
4069 | return 0; | ||
4070 | } | ||
3755 | 4071 | ||
3756 | case SIOCGIWSENS: | 4072 | /* Check that we got an whole number of atoms */ |
3757 | err = orinoco_ioctl_getsens(dev, &wrq->u.sens); | 4073 | if ((scan_len - offset) % atom_len) { |
3758 | break; | 4074 | printk(KERN_ERR "%s: Unexpected scan data length %d, " |
4075 | "atom_len %d, offset %d\n", dev->name, scan_len, | ||
4076 | atom_len, offset); | ||
4077 | return 0; | ||
4078 | } | ||
3759 | 4079 | ||
3760 | case SIOCSIWSENS: | 4080 | /* Read the entries one by one */ |
3761 | err = orinoco_ioctl_setsens(dev, &wrq->u.sens); | 4081 | for (; offset + atom_len <= scan_len; offset += atom_len) { |
3762 | if (! err) | 4082 | /* Get next atom */ |
3763 | changed = 1; | 4083 | atom = (union hermes_scan_info *) (scan + offset); |
3764 | break; | 4084 | |
4085 | /* First entry *MUST* be the AP MAC address */ | ||
4086 | iwe.cmd = SIOCGIWAP; | ||
4087 | iwe.u.ap_addr.sa_family = ARPHRD_ETHER; | ||
4088 | memcpy(iwe.u.ap_addr.sa_data, atom->a.bssid, ETH_ALEN); | ||
4089 | current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_ADDR_LEN); | ||
4090 | |||
4091 | /* Other entries will be displayed in the order we give them */ | ||
4092 | |||
4093 | /* Add the ESSID */ | ||
4094 | iwe.u.data.length = le16_to_cpu(atom->a.essid_len); | ||
4095 | if (iwe.u.data.length > 32) | ||
4096 | iwe.u.data.length = 32; | ||
4097 | iwe.cmd = SIOCGIWESSID; | ||
4098 | iwe.u.data.flags = 1; | ||
4099 | current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, atom->a.essid); | ||
4100 | |||
4101 | /* Add mode */ | ||
4102 | iwe.cmd = SIOCGIWMODE; | ||
4103 | capabilities = le16_to_cpu(atom->a.capabilities); | ||
4104 | if (capabilities & 0x3) { | ||
4105 | if (capabilities & 0x1) | ||
4106 | iwe.u.mode = IW_MODE_MASTER; | ||
4107 | else | ||
4108 | iwe.u.mode = IW_MODE_ADHOC; | ||
4109 | current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_UINT_LEN); | ||
4110 | } | ||
3765 | 4111 | ||
3766 | case SIOCGIWRTS: | 4112 | channel = atom->s.channel; |
3767 | wrq->u.rts.value = priv->rts_thresh; | 4113 | if ( (channel >= 1) && (channel <= NUM_CHANNELS) ) { |
3768 | wrq->u.rts.disabled = (wrq->u.rts.value == 2347); | 4114 | /* Add frequency */ |
3769 | wrq->u.rts.fixed = 1; | 4115 | iwe.cmd = SIOCGIWFREQ; |
3770 | break; | 4116 | iwe.u.freq.m = channel_frequency[channel-1] * 100000; |
4117 | iwe.u.freq.e = 1; | ||
4118 | current_ev = iwe_stream_add_event(current_ev, end_buf, | ||
4119 | &iwe, IW_EV_FREQ_LEN); | ||
4120 | } | ||
3771 | 4121 | ||
3772 | case SIOCSIWRTS: | 4122 | /* Add quality statistics */ |
3773 | err = orinoco_ioctl_setrts(dev, &wrq->u.rts); | 4123 | iwe.cmd = IWEVQUAL; |
3774 | if (! err) | 4124 | iwe.u.qual.updated = 0x10; /* no link quality */ |
3775 | changed = 1; | 4125 | iwe.u.qual.level = (__u8) le16_to_cpu(atom->a.level) - 0x95; |
3776 | break; | 4126 | iwe.u.qual.noise = (__u8) le16_to_cpu(atom->a.noise) - 0x95; |
4127 | /* Wireless tools prior to 27.pre22 will show link quality | ||
4128 | * anyway, so we provide a reasonable value. */ | ||
4129 | if (iwe.u.qual.level > iwe.u.qual.noise) | ||
4130 | iwe.u.qual.qual = iwe.u.qual.level - iwe.u.qual.noise; | ||
4131 | else | ||
4132 | iwe.u.qual.qual = 0; | ||
4133 | current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe, IW_EV_QUAL_LEN); | ||
3777 | 4134 | ||
3778 | case SIOCSIWFRAG: | 4135 | /* Add encryption capability */ |
3779 | err = orinoco_ioctl_setfrag(dev, &wrq->u.frag); | 4136 | iwe.cmd = SIOCGIWENCODE; |
3780 | if (! err) | 4137 | if (capabilities & 0x10) |
3781 | changed = 1; | 4138 | iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY; |
3782 | break; | 4139 | else |
4140 | iwe.u.data.flags = IW_ENCODE_DISABLED; | ||
4141 | iwe.u.data.length = 0; | ||
4142 | current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, atom->a.essid); | ||
4143 | |||
4144 | /* Bit rate is not available in Lucent/Agere firmwares */ | ||
4145 | if (priv->firmware_type != FIRMWARE_TYPE_AGERE) { | ||
4146 | char * current_val = current_ev + IW_EV_LCP_LEN; | ||
4147 | int i; | ||
4148 | int step; | ||
4149 | |||
4150 | if (priv->firmware_type == FIRMWARE_TYPE_SYMBOL) | ||
4151 | step = 2; | ||
4152 | else | ||
4153 | step = 1; | ||
4154 | |||
4155 | iwe.cmd = SIOCGIWRATE; | ||
4156 | /* Those two flags are ignored... */ | ||
4157 | iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0; | ||
4158 | /* Max 10 values */ | ||
4159 | for (i = 0; i < 10; i += step) { | ||
4160 | /* NULL terminated */ | ||
4161 | if (atom->p.rates[i] == 0x0) | ||
4162 | break; | ||
4163 | /* Bit rate given in 500 kb/s units (+ 0x80) */ | ||
4164 | iwe.u.bitrate.value = ((atom->p.rates[i] & 0x7f) * 500000); | ||
4165 | current_val = iwe_stream_add_value(current_ev, current_val, | ||
4166 | end_buf, &iwe, | ||
4167 | IW_EV_PARAM_LEN); | ||
4168 | } | ||
4169 | /* Check if we added any event */ | ||
4170 | if ((current_val - current_ev) > IW_EV_LCP_LEN) | ||
4171 | current_ev = current_val; | ||
4172 | } | ||
3783 | 4173 | ||
3784 | case SIOCGIWFRAG: | 4174 | /* The other data in the scan result are not really |
3785 | err = orinoco_ioctl_getfrag(dev, &wrq->u.frag); | 4175 | * interesting, so for now drop it - Jean II */ |
3786 | break; | 4176 | } |
4177 | return current_ev - buffer; | ||
4178 | } | ||
3787 | 4179 | ||
3788 | case SIOCSIWRATE: | 4180 | /* Return results of a scan */ |
3789 | err = orinoco_ioctl_setrate(dev, &wrq->u.bitrate); | 4181 | static int orinoco_ioctl_getscan(struct net_device *dev, |
3790 | if (! err) | 4182 | struct iw_request_info *info, |
3791 | changed = 1; | 4183 | struct iw_point *srq, |
3792 | break; | 4184 | char *extra) |
4185 | { | ||
4186 | struct orinoco_private *priv = netdev_priv(dev); | ||
4187 | int err = 0; | ||
4188 | unsigned long flags; | ||
3793 | 4189 | ||
3794 | case SIOCGIWRATE: | 4190 | if (orinoco_lock(priv, &flags) != 0) |
3795 | err = orinoco_ioctl_getrate(dev, &wrq->u.bitrate); | 4191 | return -EBUSY; |
3796 | break; | ||
3797 | 4192 | ||
3798 | case SIOCSIWPOWER: | 4193 | /* If no results yet, ask to try again later */ |
3799 | err = orinoco_ioctl_setpower(dev, &wrq->u.power); | 4194 | if (priv->scan_result == NULL) { |
3800 | if (! err) | 4195 | if (priv->scan_inprogress) |
3801 | changed = 1; | 4196 | /* Important note : we don't want to block the caller |
3802 | break; | 4197 | * until results are ready for various reasons. |
4198 | * First, managing wait queues is complex and racy. | ||
4199 | * Second, we grab some rtnetlink lock before comming | ||
4200 | * here (in dev_ioctl()). | ||
4201 | * Third, we generate an Wireless Event, so the | ||
4202 | * caller can wait itself on that - Jean II */ | ||
4203 | err = -EAGAIN; | ||
4204 | else | ||
4205 | /* Client error, no scan results... | ||
4206 | * The caller need to restart the scan. */ | ||
4207 | err = -ENODATA; | ||
4208 | } else { | ||
4209 | /* We have some results to push back to user space */ | ||
4210 | |||
4211 | /* Translate to WE format */ | ||
4212 | srq->length = orinoco_translate_scan(dev, extra, | ||
4213 | priv->scan_result, | ||
4214 | priv->scan_len); | ||
4215 | |||
4216 | /* Return flags */ | ||
4217 | srq->flags = (__u16) priv->scan_mode; | ||
4218 | |||
4219 | /* Results are here, so scan no longer in progress */ | ||
4220 | priv->scan_inprogress = 0; | ||
4221 | |||
4222 | /* In any case, Scan results will be cleaned up in the | ||
4223 | * reset function and when exiting the driver. | ||
4224 | * The person triggering the scanning may never come to | ||
4225 | * pick the results, so we need to do it in those places. | ||
4226 | * Jean II */ | ||
4227 | |||
4228 | #ifdef SCAN_SINGLE_READ | ||
4229 | /* If you enable this option, only one client (the first | ||
4230 | * one) will be able to read the result (and only one | ||
4231 | * time). If there is multiple concurent clients that | ||
4232 | * want to read scan results, this behavior is not | ||
4233 | * advisable - Jean II */ | ||
4234 | kfree(priv->scan_result); | ||
4235 | priv->scan_result = NULL; | ||
4236 | #endif /* SCAN_SINGLE_READ */ | ||
4237 | /* Here, if too much time has elapsed since last scan, | ||
4238 | * we may want to clean up scan results... - Jean II */ | ||
4239 | } | ||
4240 | |||
4241 | orinoco_unlock(priv, &flags); | ||
4242 | return err; | ||
4243 | } | ||
3803 | 4244 | ||
3804 | case SIOCGIWPOWER: | 4245 | /* Commit handler, called after set operations */ |
3805 | err = orinoco_ioctl_getpower(dev, &wrq->u.power); | 4246 | static int orinoco_ioctl_commit(struct net_device *dev, |
3806 | break; | 4247 | struct iw_request_info *info, |
4248 | void *wrqu, | ||
4249 | char *extra) | ||
4250 | { | ||
4251 | struct orinoco_private *priv = netdev_priv(dev); | ||
4252 | struct hermes *hw = &priv->hw; | ||
4253 | unsigned long flags; | ||
4254 | int err = 0; | ||
3807 | 4255 | ||
3808 | case SIOCGIWTXPOW: | 4256 | if (!priv->open) |
3809 | /* The card only supports one tx power, so this is easy */ | 4257 | return 0; |
3810 | wrq->u.txpower.value = 15; /* dBm */ | ||
3811 | wrq->u.txpower.fixed = 1; | ||
3812 | wrq->u.txpower.disabled = 0; | ||
3813 | wrq->u.txpower.flags = IW_TXPOW_DBM; | ||
3814 | break; | ||
3815 | 4258 | ||
3816 | case SIOCSIWRETRY: | 4259 | if (priv->broken_disableport) { |
3817 | err = -EOPNOTSUPP; | 4260 | orinoco_reset(dev); |
3818 | break; | 4261 | return 0; |
4262 | } | ||
3819 | 4263 | ||
3820 | case SIOCGIWRETRY: | 4264 | if (orinoco_lock(priv, &flags) != 0) |
3821 | err = orinoco_ioctl_getretry(dev, &wrq->u.retry); | 4265 | return err; |
3822 | break; | ||
3823 | 4266 | ||
3824 | case SIOCSIWSPY: | 4267 | err = hermes_disable_port(hw, 0); |
3825 | err = orinoco_ioctl_setspy(dev, &wrq->u.data); | 4268 | if (err) { |
3826 | break; | 4269 | printk(KERN_WARNING "%s: Unable to disable port " |
4270 | "while reconfiguring card\n", dev->name); | ||
4271 | priv->broken_disableport = 1; | ||
4272 | goto out; | ||
4273 | } | ||
3827 | 4274 | ||
3828 | case SIOCGIWSPY: | 4275 | err = __orinoco_program_rids(dev); |
3829 | err = orinoco_ioctl_getspy(dev, &wrq->u.data); | 4276 | if (err) { |
3830 | break; | 4277 | printk(KERN_WARNING "%s: Unable to reconfigure card\n", |
4278 | dev->name); | ||
4279 | goto out; | ||
4280 | } | ||
3831 | 4281 | ||
3832 | case SIOCGIWPRIV: | 4282 | err = hermes_enable_port(hw, 0); |
3833 | if (wrq->u.data.pointer) { | 4283 | if (err) { |
3834 | struct iw_priv_args privtab[] = { | 4284 | printk(KERN_WARNING "%s: Unable to enable port while reconfiguring card\n", |
3835 | { SIOCIWFIRSTPRIV + 0x0, 0, 0, "force_reset" }, | 4285 | dev->name); |
3836 | { SIOCIWFIRSTPRIV + 0x1, 0, 0, "card_reset" }, | 4286 | goto out; |
3837 | { SIOCIWFIRSTPRIV + 0x2, | 4287 | } |
3838 | IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, | ||
3839 | 0, "set_port3" }, | ||
3840 | { SIOCIWFIRSTPRIV + 0x3, 0, | ||
3841 | IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, | ||
3842 | "get_port3" }, | ||
3843 | { SIOCIWFIRSTPRIV + 0x4, | ||
3844 | IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, | ||
3845 | 0, "set_preamble" }, | ||
3846 | { SIOCIWFIRSTPRIV + 0x5, 0, | ||
3847 | IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, | ||
3848 | "get_preamble" }, | ||
3849 | { SIOCIWFIRSTPRIV + 0x6, | ||
3850 | IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, | ||
3851 | 0, "set_ibssport" }, | ||
3852 | { SIOCIWFIRSTPRIV + 0x7, 0, | ||
3853 | IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, | ||
3854 | "get_ibssport" }, | ||
3855 | }; | ||
3856 | |||
3857 | wrq->u.data.length = sizeof(privtab) / sizeof(privtab[0]); | ||
3858 | if (copy_to_user(wrq->u.data.pointer, privtab, sizeof(privtab))) | ||
3859 | err = -EFAULT; | ||
3860 | } | ||
3861 | break; | ||
3862 | |||
3863 | case SIOCIWFIRSTPRIV + 0x0: /* force_reset */ | ||
3864 | case SIOCIWFIRSTPRIV + 0x1: /* card_reset */ | ||
3865 | if (! capable(CAP_NET_ADMIN)) { | ||
3866 | err = -EPERM; | ||
3867 | break; | ||
3868 | } | ||
3869 | |||
3870 | printk(KERN_DEBUG "%s: Force scheduling reset!\n", dev->name); | ||
3871 | 4288 | ||
4289 | out: | ||
4290 | if (err) { | ||
4291 | printk(KERN_WARNING "%s: Resetting instead...\n", dev->name); | ||
3872 | schedule_work(&priv->reset_work); | 4292 | schedule_work(&priv->reset_work); |
3873 | break; | 4293 | err = 0; |
3874 | 4294 | } | |
3875 | case SIOCIWFIRSTPRIV + 0x2: /* set_port3 */ | ||
3876 | if (! capable(CAP_NET_ADMIN)) { | ||
3877 | err = -EPERM; | ||
3878 | break; | ||
3879 | } | ||
3880 | |||
3881 | err = orinoco_ioctl_setport3(dev, wrq); | ||
3882 | if (! err) | ||
3883 | changed = 1; | ||
3884 | break; | ||
3885 | 4295 | ||
3886 | case SIOCIWFIRSTPRIV + 0x3: /* get_port3 */ | 4296 | orinoco_unlock(priv, &flags); |
3887 | err = orinoco_ioctl_getport3(dev, wrq); | 4297 | return err; |
3888 | break; | 4298 | } |
3889 | 4299 | ||
3890 | case SIOCIWFIRSTPRIV + 0x4: /* set_preamble */ | 4300 | static const struct iw_priv_args orinoco_privtab[] = { |
3891 | if (! capable(CAP_NET_ADMIN)) { | 4301 | { SIOCIWFIRSTPRIV + 0x0, 0, 0, "force_reset" }, |
3892 | err = -EPERM; | 4302 | { SIOCIWFIRSTPRIV + 0x1, 0, 0, "card_reset" }, |
3893 | break; | 4303 | { SIOCIWFIRSTPRIV + 0x2, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, |
3894 | } | 4304 | 0, "set_port3" }, |
4305 | { SIOCIWFIRSTPRIV + 0x3, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, | ||
4306 | "get_port3" }, | ||
4307 | { SIOCIWFIRSTPRIV + 0x4, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, | ||
4308 | 0, "set_preamble" }, | ||
4309 | { SIOCIWFIRSTPRIV + 0x5, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, | ||
4310 | "get_preamble" }, | ||
4311 | { SIOCIWFIRSTPRIV + 0x6, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, | ||
4312 | 0, "set_ibssport" }, | ||
4313 | { SIOCIWFIRSTPRIV + 0x7, 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, | ||
4314 | "get_ibssport" }, | ||
4315 | { SIOCIWFIRSTPRIV + 0x9, 0, IW_PRIV_TYPE_BYTE | MAX_RID_LEN, | ||
4316 | "get_rid" }, | ||
4317 | }; | ||
3895 | 4318 | ||
3896 | /* 802.11b has recently defined some short preamble. | ||
3897 | * Basically, the Phy header has been reduced in size. | ||
3898 | * This increase performance, especially at high rates | ||
3899 | * (the preamble is transmitted at 1Mb/s), unfortunately | ||
3900 | * this give compatibility troubles... - Jean II */ | ||
3901 | if(priv->has_preamble) { | ||
3902 | int val = *( (int *) wrq->u.name ); | ||
3903 | |||
3904 | if (orinoco_lock(priv, &flags) != 0) | ||
3905 | return -EBUSY; | ||
3906 | if (val) | ||
3907 | priv->preamble = 1; | ||
3908 | else | ||
3909 | priv->preamble = 0; | ||
3910 | orinoco_unlock(priv, &flags); | ||
3911 | changed = 1; | ||
3912 | } else | ||
3913 | err = -EOPNOTSUPP; | ||
3914 | break; | ||
3915 | 4319 | ||
3916 | case SIOCIWFIRSTPRIV + 0x5: /* get_preamble */ | 4320 | /* |
3917 | if(priv->has_preamble) { | 4321 | * Structures to export the Wireless Handlers |
3918 | int *val = (int *)wrq->u.name; | 4322 | */ |
3919 | 4323 | ||
3920 | if (orinoco_lock(priv, &flags) != 0) | 4324 | static const iw_handler orinoco_handler[] = { |
3921 | return -EBUSY; | 4325 | [SIOCSIWCOMMIT-SIOCIWFIRST] (iw_handler) orinoco_ioctl_commit, |
3922 | *val = priv->preamble; | 4326 | [SIOCGIWNAME -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getname, |
3923 | orinoco_unlock(priv, &flags); | 4327 | [SIOCSIWFREQ -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setfreq, |
3924 | } else | 4328 | [SIOCGIWFREQ -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getfreq, |
3925 | err = -EOPNOTSUPP; | 4329 | [SIOCSIWMODE -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setmode, |
3926 | break; | 4330 | [SIOCGIWMODE -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getmode, |
3927 | case SIOCIWFIRSTPRIV + 0x6: /* set_ibssport */ | 4331 | [SIOCSIWSENS -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setsens, |
3928 | if (! capable(CAP_NET_ADMIN)) { | 4332 | [SIOCGIWSENS -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getsens, |
3929 | err = -EPERM; | 4333 | [SIOCGIWRANGE -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getiwrange, |
3930 | break; | 4334 | [SIOCSIWSPY -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setspy, |
3931 | } | 4335 | [SIOCGIWSPY -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getspy, |
4336 | [SIOCSIWAP -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setwap, | ||
4337 | [SIOCGIWAP -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getwap, | ||
4338 | [SIOCSIWSCAN -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setscan, | ||
4339 | [SIOCGIWSCAN -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getscan, | ||
4340 | [SIOCSIWESSID -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setessid, | ||
4341 | [SIOCGIWESSID -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getessid, | ||
4342 | [SIOCSIWNICKN -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setnick, | ||
4343 | [SIOCGIWNICKN -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getnick, | ||
4344 | [SIOCSIWRATE -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setrate, | ||
4345 | [SIOCGIWRATE -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getrate, | ||
4346 | [SIOCSIWRTS -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setrts, | ||
4347 | [SIOCGIWRTS -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getrts, | ||
4348 | [SIOCSIWFRAG -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setfrag, | ||
4349 | [SIOCGIWFRAG -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getfrag, | ||
4350 | [SIOCGIWRETRY -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getretry, | ||
4351 | [SIOCSIWENCODE-SIOCIWFIRST] (iw_handler) orinoco_ioctl_setiwencode, | ||
4352 | [SIOCGIWENCODE-SIOCIWFIRST] (iw_handler) orinoco_ioctl_getiwencode, | ||
4353 | [SIOCSIWPOWER -SIOCIWFIRST] (iw_handler) orinoco_ioctl_setpower, | ||
4354 | [SIOCGIWPOWER -SIOCIWFIRST] (iw_handler) orinoco_ioctl_getpower, | ||
4355 | }; | ||
3932 | 4356 | ||
3933 | err = orinoco_ioctl_setibssport(dev, wrq); | ||
3934 | if (! err) | ||
3935 | changed = 1; | ||
3936 | break; | ||
3937 | 4357 | ||
3938 | case SIOCIWFIRSTPRIV + 0x7: /* get_ibssport */ | 4358 | /* |
3939 | err = orinoco_ioctl_getibssport(dev, wrq); | 4359 | Added typecasting since we no longer use iwreq_data -- Moustafa |
3940 | break; | 4360 | */ |
4361 | static const iw_handler orinoco_private_handler[] = { | ||
4362 | [0] (iw_handler) orinoco_ioctl_reset, | ||
4363 | [1] (iw_handler) orinoco_ioctl_reset, | ||
4364 | [2] (iw_handler) orinoco_ioctl_setport3, | ||
4365 | [3] (iw_handler) orinoco_ioctl_getport3, | ||
4366 | [4] (iw_handler) orinoco_ioctl_setpreamble, | ||
4367 | [5] (iw_handler) orinoco_ioctl_getpreamble, | ||
4368 | [6] (iw_handler) orinoco_ioctl_setibssport, | ||
4369 | [7] (iw_handler) orinoco_ioctl_getibssport, | ||
4370 | [9] (iw_handler) orinoco_ioctl_getrid, | ||
4371 | }; | ||
3941 | 4372 | ||
3942 | default: | 4373 | static const struct iw_handler_def orinoco_handler_def = { |
3943 | err = -EOPNOTSUPP; | 4374 | .num_standard = ARRAY_SIZE(orinoco_handler), |
3944 | } | 4375 | .num_private = ARRAY_SIZE(orinoco_private_handler), |
3945 | 4376 | .num_private_args = ARRAY_SIZE(orinoco_privtab), | |
3946 | if (! err && changed && netif_running(dev)) { | 4377 | .standard = orinoco_handler, |
3947 | err = orinoco_reconfigure(dev); | 4378 | .private = orinoco_private_handler, |
3948 | } | 4379 | .private_args = orinoco_privtab, |
4380 | }; | ||
3949 | 4381 | ||
3950 | TRACE_EXIT(dev->name); | 4382 | static void orinoco_get_drvinfo(struct net_device *dev, |
4383 | struct ethtool_drvinfo *info) | ||
4384 | { | ||
4385 | struct orinoco_private *priv = netdev_priv(dev); | ||
3951 | 4386 | ||
3952 | return err; | 4387 | strncpy(info->driver, DRIVER_NAME, sizeof(info->driver) - 1); |
4388 | strncpy(info->version, DRIVER_VERSION, sizeof(info->version) - 1); | ||
4389 | strncpy(info->fw_version, priv->fw_name, sizeof(info->fw_version) - 1); | ||
4390 | if (dev->class_dev.dev) | ||
4391 | strncpy(info->bus_info, dev->class_dev.dev->bus_id, | ||
4392 | sizeof(info->bus_info) - 1); | ||
4393 | else | ||
4394 | snprintf(info->bus_info, sizeof(info->bus_info) - 1, | ||
4395 | "PCMCIA %p", priv->hw.iobase); | ||
3953 | } | 4396 | } |
3954 | 4397 | ||
4398 | static struct ethtool_ops orinoco_ethtool_ops = { | ||
4399 | .get_drvinfo = orinoco_get_drvinfo, | ||
4400 | .get_link = ethtool_op_get_link, | ||
4401 | }; | ||
3955 | 4402 | ||
3956 | /********************************************************************/ | 4403 | /********************************************************************/ |
3957 | /* Debugging */ | 4404 | /* Debugging */ |
diff --git a/drivers/net/wireless/orinoco.h b/drivers/net/wireless/orinoco.h index f749b50d1088..2f213a7103fe 100644 --- a/drivers/net/wireless/orinoco.h +++ b/drivers/net/wireless/orinoco.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #ifndef _ORINOCO_H | 7 | #ifndef _ORINOCO_H |
8 | #define _ORINOCO_H | 8 | #define _ORINOCO_H |
9 | 9 | ||
10 | #define DRIVER_VERSION "0.14alpha2" | 10 | #define DRIVER_VERSION "0.15rc2" |
11 | 11 | ||
12 | #include <linux/types.h> | 12 | #include <linux/types.h> |
13 | #include <linux/spinlock.h> | 13 | #include <linux/spinlock.h> |
@@ -22,6 +22,8 @@ | |||
22 | 22 | ||
23 | #define WIRELESS_SPY // enable iwspy support | 23 | #define WIRELESS_SPY // enable iwspy support |
24 | 24 | ||
25 | #define MAX_SCAN_LEN 4096 | ||
26 | |||
25 | #define ORINOCO_MAX_KEY_SIZE 14 | 27 | #define ORINOCO_MAX_KEY_SIZE 14 |
26 | #define ORINOCO_MAX_KEYS 4 | 28 | #define ORINOCO_MAX_KEYS 4 |
27 | 29 | ||
@@ -30,6 +32,20 @@ struct orinoco_key { | |||
30 | char data[ORINOCO_MAX_KEY_SIZE]; | 32 | char data[ORINOCO_MAX_KEY_SIZE]; |
31 | } __attribute__ ((packed)); | 33 | } __attribute__ ((packed)); |
32 | 34 | ||
35 | struct header_struct { | ||
36 | /* 802.3 */ | ||
37 | u8 dest[ETH_ALEN]; | ||
38 | u8 src[ETH_ALEN]; | ||
39 | u16 len; | ||
40 | /* 802.2 */ | ||
41 | u8 dsap; | ||
42 | u8 ssap; | ||
43 | u8 ctrl; | ||
44 | /* SNAP */ | ||
45 | u8 oui[3]; | ||
46 | u16 ethertype; | ||
47 | } __attribute__ ((packed)); | ||
48 | |||
33 | typedef enum { | 49 | typedef enum { |
34 | FIRMWARE_TYPE_AGERE, | 50 | FIRMWARE_TYPE_AGERE, |
35 | FIRMWARE_TYPE_INTERSIL, | 51 | FIRMWARE_TYPE_INTERSIL, |
@@ -48,6 +64,8 @@ struct orinoco_private { | |||
48 | /* driver state */ | 64 | /* driver state */ |
49 | int open; | 65 | int open; |
50 | u16 last_linkstatus; | 66 | u16 last_linkstatus; |
67 | struct work_struct join_work; | ||
68 | struct work_struct wevent_work; | ||
51 | 69 | ||
52 | /* Net device stuff */ | 70 | /* Net device stuff */ |
53 | struct net_device *ndev; | 71 | struct net_device *ndev; |
@@ -74,7 +92,9 @@ struct orinoco_private { | |||
74 | unsigned int has_pm:1; | 92 | unsigned int has_pm:1; |
75 | unsigned int has_preamble:1; | 93 | unsigned int has_preamble:1; |
76 | unsigned int has_sensitivity:1; | 94 | unsigned int has_sensitivity:1; |
95 | unsigned int has_hostscan:1; | ||
77 | unsigned int broken_disableport:1; | 96 | unsigned int broken_disableport:1; |
97 | unsigned int broken_monitor:1; | ||
78 | 98 | ||
79 | /* Configuration paramaters */ | 99 | /* Configuration paramaters */ |
80 | u32 iw_mode; | 100 | u32 iw_mode; |
@@ -84,6 +104,8 @@ struct orinoco_private { | |||
84 | int bitratemode; | 104 | int bitratemode; |
85 | char nick[IW_ESSID_MAX_SIZE+1]; | 105 | char nick[IW_ESSID_MAX_SIZE+1]; |
86 | char desired_essid[IW_ESSID_MAX_SIZE+1]; | 106 | char desired_essid[IW_ESSID_MAX_SIZE+1]; |
107 | char desired_bssid[ETH_ALEN]; | ||
108 | int bssid_fixed; | ||
87 | u16 frag_thresh, mwo_robust; | 109 | u16 frag_thresh, mwo_robust; |
88 | u16 channel; | 110 | u16 channel; |
89 | u16 ap_density, rts_thresh; | 111 | u16 ap_density, rts_thresh; |
@@ -98,6 +120,12 @@ struct orinoco_private { | |||
98 | /* Configuration dependent variables */ | 120 | /* Configuration dependent variables */ |
99 | int port_type, createibss; | 121 | int port_type, createibss; |
100 | int promiscuous, mc_count; | 122 | int promiscuous, mc_count; |
123 | |||
124 | /* Scanning support */ | ||
125 | int scan_inprogress; /* Scan pending... */ | ||
126 | u32 scan_mode; /* Type of scan done */ | ||
127 | char * scan_result; /* Result of previous scan */ | ||
128 | int scan_len; /* Lenght of result */ | ||
101 | }; | 129 | }; |
102 | 130 | ||
103 | #ifdef ORINOCO_DEBUG | 131 | #ifdef ORINOCO_DEBUG |
diff --git a/drivers/net/wireless/prism54/isl_38xx.c b/drivers/net/wireless/prism54/isl_38xx.c index 4481ec18c5a0..adc7499136dc 100644 --- a/drivers/net/wireless/prism54/isl_38xx.c +++ b/drivers/net/wireless/prism54/isl_38xx.c | |||
@@ -112,10 +112,10 @@ isl38xx_handle_wakeup(isl38xx_control_block *control_block, | |||
112 | void | 112 | void |
113 | isl38xx_trigger_device(int asleep, void __iomem *device_base) | 113 | isl38xx_trigger_device(int asleep, void __iomem *device_base) |
114 | { | 114 | { |
115 | struct timeval current_time; | ||
116 | u32 reg, counter = 0; | 115 | u32 reg, counter = 0; |
117 | 116 | ||
118 | #if VERBOSE > SHOW_ERROR_MESSAGES | 117 | #if VERBOSE > SHOW_ERROR_MESSAGES |
118 | struct timeval current_time; | ||
119 | DEBUG(SHOW_FUNCTION_CALLS, "isl38xx trigger device\n"); | 119 | DEBUG(SHOW_FUNCTION_CALLS, "isl38xx trigger device\n"); |
120 | #endif | 120 | #endif |
121 | 121 | ||
@@ -126,11 +126,11 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base) | |||
126 | do_gettimeofday(¤t_time); | 126 | do_gettimeofday(¤t_time); |
127 | DEBUG(SHOW_TRACING, "%08li.%08li Device wakeup triggered\n", | 127 | DEBUG(SHOW_TRACING, "%08li.%08li Device wakeup triggered\n", |
128 | current_time.tv_sec, (long)current_time.tv_usec); | 128 | current_time.tv_sec, (long)current_time.tv_usec); |
129 | #endif | ||
130 | 129 | ||
131 | DEBUG(SHOW_TRACING, "%08li.%08li Device register read %08x\n", | 130 | DEBUG(SHOW_TRACING, "%08li.%08li Device register read %08x\n", |
132 | current_time.tv_sec, (long)current_time.tv_usec, | 131 | current_time.tv_sec, (long)current_time.tv_usec, |
133 | readl(device_base + ISL38XX_CTRL_STAT_REG)); | 132 | readl(device_base + ISL38XX_CTRL_STAT_REG)); |
133 | #endif | ||
134 | udelay(ISL38XX_WRITEIO_DELAY); | 134 | udelay(ISL38XX_WRITEIO_DELAY); |
135 | 135 | ||
136 | reg = readl(device_base + ISL38XX_INT_IDENT_REG); | 136 | reg = readl(device_base + ISL38XX_INT_IDENT_REG); |
@@ -148,10 +148,12 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base) | |||
148 | counter++; | 148 | counter++; |
149 | } | 149 | } |
150 | 150 | ||
151 | #if VERBOSE > SHOW_ERROR_MESSAGES | ||
151 | DEBUG(SHOW_TRACING, | 152 | DEBUG(SHOW_TRACING, |
152 | "%08li.%08li Device register read %08x\n", | 153 | "%08li.%08li Device register read %08x\n", |
153 | current_time.tv_sec, (long)current_time.tv_usec, | 154 | current_time.tv_sec, (long)current_time.tv_usec, |
154 | readl(device_base + ISL38XX_CTRL_STAT_REG)); | 155 | readl(device_base + ISL38XX_CTRL_STAT_REG)); |
156 | #endif | ||
155 | udelay(ISL38XX_WRITEIO_DELAY); | 157 | udelay(ISL38XX_WRITEIO_DELAY); |
156 | 158 | ||
157 | #if VERBOSE > SHOW_ERROR_MESSAGES | 159 | #if VERBOSE > SHOW_ERROR_MESSAGES |