diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-04-15 16:21:34 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-04-15 16:21:34 -0400 |
commit | 5c01d5669356e13f0fb468944c1dd4c6a7e978ad (patch) | |
tree | fa43345288d7b25fac92b3b35360a177c4947313 /drivers/net/wireless/prism54 | |
parent | fea069152614cdeefba4b2bf80afcddb9c217fc8 (diff) | |
parent | a5e944f1d955f3819503348426763e21e0413ba6 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/wl12xx/wl1271_main.c
Diffstat (limited to 'drivers/net/wireless/prism54')
-rw-r--r-- | drivers/net/wireless/prism54/islpci_dev.c | 16 | ||||
-rw-r--r-- | drivers/net/wireless/prism54/islpci_eth.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/prism54/islpci_mgt.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/prism54/oid_mgt.c | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c index 689d59a13d5b..10d91afefa33 100644 --- a/drivers/net/wireless/prism54/islpci_dev.c +++ b/drivers/net/wireless/prism54/islpci_dev.c | |||
@@ -228,14 +228,14 @@ islpci_interrupt(int irq, void *config) | |||
228 | 228 | ||
229 | #if VERBOSE > SHOW_ERROR_MESSAGES | 229 | #if VERBOSE > SHOW_ERROR_MESSAGES |
230 | DEBUG(SHOW_FUNCTION_CALLS, | 230 | DEBUG(SHOW_FUNCTION_CALLS, |
231 | "IRQ: Identification register 0x%p 0x%x \n", device, reg); | 231 | "IRQ: Identification register 0x%p 0x%x\n", device, reg); |
232 | #endif | 232 | #endif |
233 | 233 | ||
234 | /* check for each bit in the register separately */ | 234 | /* check for each bit in the register separately */ |
235 | if (reg & ISL38XX_INT_IDENT_UPDATE) { | 235 | if (reg & ISL38XX_INT_IDENT_UPDATE) { |
236 | #if VERBOSE > SHOW_ERROR_MESSAGES | 236 | #if VERBOSE > SHOW_ERROR_MESSAGES |
237 | /* Queue has been updated */ | 237 | /* Queue has been updated */ |
238 | DEBUG(SHOW_TRACING, "IRQ: Update flag \n"); | 238 | DEBUG(SHOW_TRACING, "IRQ: Update flag\n"); |
239 | 239 | ||
240 | DEBUG(SHOW_QUEUE_INDEXES, | 240 | DEBUG(SHOW_QUEUE_INDEXES, |
241 | "CB drv Qs: [%i][%i][%i][%i][%i][%i]\n", | 241 | "CB drv Qs: [%i][%i][%i][%i][%i][%i]\n", |
@@ -301,7 +301,7 @@ islpci_interrupt(int irq, void *config) | |||
301 | ISL38XX_CB_RX_DATA_LQ) != 0) { | 301 | ISL38XX_CB_RX_DATA_LQ) != 0) { |
302 | #if VERBOSE > SHOW_ERROR_MESSAGES | 302 | #if VERBOSE > SHOW_ERROR_MESSAGES |
303 | DEBUG(SHOW_TRACING, | 303 | DEBUG(SHOW_TRACING, |
304 | "Received frame in Data Low Queue \n"); | 304 | "Received frame in Data Low Queue\n"); |
305 | #endif | 305 | #endif |
306 | islpci_eth_receive(priv); | 306 | islpci_eth_receive(priv); |
307 | } | 307 | } |
@@ -326,7 +326,7 @@ islpci_interrupt(int irq, void *config) | |||
326 | /* Device has been initialized */ | 326 | /* Device has been initialized */ |
327 | #if VERBOSE > SHOW_ERROR_MESSAGES | 327 | #if VERBOSE > SHOW_ERROR_MESSAGES |
328 | DEBUG(SHOW_TRACING, | 328 | DEBUG(SHOW_TRACING, |
329 | "IRQ: Init flag, device initialized \n"); | 329 | "IRQ: Init flag, device initialized\n"); |
330 | #endif | 330 | #endif |
331 | wake_up(&priv->reset_done); | 331 | wake_up(&priv->reset_done); |
332 | } | 332 | } |
@@ -334,7 +334,7 @@ islpci_interrupt(int irq, void *config) | |||
334 | if (reg & ISL38XX_INT_IDENT_SLEEP) { | 334 | if (reg & ISL38XX_INT_IDENT_SLEEP) { |
335 | /* Device intends to move to powersave state */ | 335 | /* Device intends to move to powersave state */ |
336 | #if VERBOSE > SHOW_ERROR_MESSAGES | 336 | #if VERBOSE > SHOW_ERROR_MESSAGES |
337 | DEBUG(SHOW_TRACING, "IRQ: Sleep flag \n"); | 337 | DEBUG(SHOW_TRACING, "IRQ: Sleep flag\n"); |
338 | #endif | 338 | #endif |
339 | isl38xx_handle_sleep_request(priv->control_block, | 339 | isl38xx_handle_sleep_request(priv->control_block, |
340 | &powerstate, | 340 | &powerstate, |
@@ -344,7 +344,7 @@ islpci_interrupt(int irq, void *config) | |||
344 | if (reg & ISL38XX_INT_IDENT_WAKEUP) { | 344 | if (reg & ISL38XX_INT_IDENT_WAKEUP) { |
345 | /* Device has been woken up to active state */ | 345 | /* Device has been woken up to active state */ |
346 | #if VERBOSE > SHOW_ERROR_MESSAGES | 346 | #if VERBOSE > SHOW_ERROR_MESSAGES |
347 | DEBUG(SHOW_TRACING, "IRQ: Wakeup flag \n"); | 347 | DEBUG(SHOW_TRACING, "IRQ: Wakeup flag\n"); |
348 | #endif | 348 | #endif |
349 | 349 | ||
350 | isl38xx_handle_wakeup(priv->control_block, | 350 | isl38xx_handle_wakeup(priv->control_block, |
@@ -635,7 +635,7 @@ islpci_alloc_memory(islpci_private *priv) | |||
635 | ioremap(pci_resource_start(priv->pdev, 0), | 635 | ioremap(pci_resource_start(priv->pdev, 0), |
636 | ISL38XX_PCI_MEM_SIZE))) { | 636 | ISL38XX_PCI_MEM_SIZE))) { |
637 | /* error in remapping the PCI device memory address range */ | 637 | /* error in remapping the PCI device memory address range */ |
638 | printk(KERN_ERR "PCI memory remapping failed \n"); | 638 | printk(KERN_ERR "PCI memory remapping failed\n"); |
639 | return -1; | 639 | return -1; |
640 | } | 640 | } |
641 | 641 | ||
@@ -902,7 +902,7 @@ islpci_setup(struct pci_dev *pdev) | |||
902 | 902 | ||
903 | if (register_netdev(ndev)) { | 903 | if (register_netdev(ndev)) { |
904 | DEBUG(SHOW_ERROR_MESSAGES, | 904 | DEBUG(SHOW_ERROR_MESSAGES, |
905 | "ERROR: register_netdev() failed \n"); | 905 | "ERROR: register_netdev() failed\n"); |
906 | goto do_islpci_free_memory; | 906 | goto do_islpci_free_memory; |
907 | } | 907 | } |
908 | 908 | ||
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c index ac99eaaeabce..64585da8a96c 100644 --- a/drivers/net/wireless/prism54/islpci_eth.c +++ b/drivers/net/wireless/prism54/islpci_eth.c | |||
@@ -90,7 +90,7 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev) | |||
90 | u32 curr_frag; | 90 | u32 curr_frag; |
91 | 91 | ||
92 | #if VERBOSE > SHOW_ERROR_MESSAGES | 92 | #if VERBOSE > SHOW_ERROR_MESSAGES |
93 | DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_transmit \n"); | 93 | DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_transmit\n"); |
94 | #endif | 94 | #endif |
95 | 95 | ||
96 | /* lock the driver code */ | 96 | /* lock the driver code */ |
@@ -141,7 +141,7 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev) | |||
141 | } | 141 | } |
142 | 142 | ||
143 | #if VERBOSE > SHOW_ERROR_MESSAGES | 143 | #if VERBOSE > SHOW_ERROR_MESSAGES |
144 | DEBUG(SHOW_TRACING, "memmove %p %p %i \n", skb->data, | 144 | DEBUG(SHOW_TRACING, "memmove %p %p %i\n", skb->data, |
145 | src, skb->len); | 145 | src, skb->len); |
146 | #endif | 146 | #endif |
147 | } else { | 147 | } else { |
@@ -320,7 +320,7 @@ islpci_eth_receive(islpci_private *priv) | |||
320 | int discard = 0; | 320 | int discard = 0; |
321 | 321 | ||
322 | #if VERBOSE > SHOW_ERROR_MESSAGES | 322 | #if VERBOSE > SHOW_ERROR_MESSAGES |
323 | DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_receive \n"); | 323 | DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_receive\n"); |
324 | #endif | 324 | #endif |
325 | 325 | ||
326 | /* the device has written an Ethernet frame in the data area | 326 | /* the device has written an Ethernet frame in the data area |
@@ -432,7 +432,7 @@ islpci_eth_receive(islpci_private *priv) | |||
432 | skb = dev_alloc_skb(MAX_FRAGMENT_SIZE_RX + 2); | 432 | skb = dev_alloc_skb(MAX_FRAGMENT_SIZE_RX + 2); |
433 | if (unlikely(skb == NULL)) { | 433 | if (unlikely(skb == NULL)) { |
434 | /* error allocating an sk_buff structure elements */ | 434 | /* error allocating an sk_buff structure elements */ |
435 | DEBUG(SHOW_ERROR_MESSAGES, "Error allocating skb \n"); | 435 | DEBUG(SHOW_ERROR_MESSAGES, "Error allocating skb\n"); |
436 | break; | 436 | break; |
437 | } | 437 | } |
438 | skb_reserve(skb, (4 - (long) skb->data) & 0x03); | 438 | skb_reserve(skb, (4 - (long) skb->data) & 0x03); |
diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c index adb289723a96..a5224f6160e4 100644 --- a/drivers/net/wireless/prism54/islpci_mgt.c +++ b/drivers/net/wireless/prism54/islpci_mgt.c | |||
@@ -114,7 +114,7 @@ islpci_mgmt_rx_fill(struct net_device *ndev) | |||
114 | u32 curr = le32_to_cpu(cb->driver_curr_frag[ISL38XX_CB_RX_MGMTQ]); | 114 | u32 curr = le32_to_cpu(cb->driver_curr_frag[ISL38XX_CB_RX_MGMTQ]); |
115 | 115 | ||
116 | #if VERBOSE > SHOW_ERROR_MESSAGES | 116 | #if VERBOSE > SHOW_ERROR_MESSAGES |
117 | DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgmt_rx_fill \n"); | 117 | DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgmt_rx_fill\n"); |
118 | #endif | 118 | #endif |
119 | 119 | ||
120 | while (curr - priv->index_mgmt_rx < ISL38XX_CB_MGMT_QSIZE) { | 120 | while (curr - priv->index_mgmt_rx < ISL38XX_CB_MGMT_QSIZE) { |
@@ -212,7 +212,7 @@ islpci_mgt_transmit(struct net_device *ndev, int operation, unsigned long oid, | |||
212 | { | 212 | { |
213 | pimfor_header_t *h = buf.mem; | 213 | pimfor_header_t *h = buf.mem; |
214 | DEBUG(SHOW_PIMFOR_FRAMES, | 214 | DEBUG(SHOW_PIMFOR_FRAMES, |
215 | "PIMFOR: op %i, oid 0x%08lx, device %i, flags 0x%x length 0x%x \n", | 215 | "PIMFOR: op %i, oid 0x%08lx, device %i, flags 0x%x length 0x%x\n", |
216 | h->operation, oid, h->device_id, h->flags, length); | 216 | h->operation, oid, h->device_id, h->flags, length); |
217 | 217 | ||
218 | /* display the buffer contents for debugging */ | 218 | /* display the buffer contents for debugging */ |
@@ -280,7 +280,7 @@ islpci_mgt_receive(struct net_device *ndev) | |||
280 | u32 curr_frag; | 280 | u32 curr_frag; |
281 | 281 | ||
282 | #if VERBOSE > SHOW_ERROR_MESSAGES | 282 | #if VERBOSE > SHOW_ERROR_MESSAGES |
283 | DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgt_receive \n"); | 283 | DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgt_receive\n"); |
284 | #endif | 284 | #endif |
285 | 285 | ||
286 | /* Only once per interrupt, determine fragment range to | 286 | /* Only once per interrupt, determine fragment range to |
@@ -339,7 +339,7 @@ islpci_mgt_receive(struct net_device *ndev) | |||
339 | 339 | ||
340 | #if VERBOSE > SHOW_ERROR_MESSAGES | 340 | #if VERBOSE > SHOW_ERROR_MESSAGES |
341 | DEBUG(SHOW_PIMFOR_FRAMES, | 341 | DEBUG(SHOW_PIMFOR_FRAMES, |
342 | "PIMFOR: op %i, oid 0x%08x, device %i, flags 0x%x length 0x%x \n", | 342 | "PIMFOR: op %i, oid 0x%08x, device %i, flags 0x%x length 0x%x\n", |
343 | header->operation, header->oid, header->device_id, | 343 | header->operation, header->oid, header->device_id, |
344 | header->flags, header->length); | 344 | header->flags, header->length); |
345 | 345 | ||
diff --git a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/prism54/oid_mgt.c index d66933d70fb9..9b796cae4afe 100644 --- a/drivers/net/wireless/prism54/oid_mgt.c +++ b/drivers/net/wireless/prism54/oid_mgt.c | |||
@@ -820,7 +820,7 @@ mgt_response_to_str(enum oid_num_t n, union oid_res_t *r, char *str) | |||
820 | k = snprintf(str, PRIV_STR_SIZE, "nr=%u\n", list->nr); | 820 | k = snprintf(str, PRIV_STR_SIZE, "nr=%u\n", list->nr); |
821 | for (i = 0; i < list->nr; i++) | 821 | for (i = 0; i < list->nr; i++) |
822 | k += snprintf(str + k, PRIV_STR_SIZE - k, | 822 | k += snprintf(str + k, PRIV_STR_SIZE - k, |
823 | "bss[%u] : \nage=%u\nchannel=%u\n" | 823 | "bss[%u] :\nage=%u\nchannel=%u\n" |
824 | "capinfo=0x%X\nrates=0x%X\n" | 824 | "capinfo=0x%X\nrates=0x%X\n" |
825 | "basic_rates=0x%X\n", | 825 | "basic_rates=0x%X\n", |
826 | i, list->bsslist[i].age, | 826 | i, list->bsslist[i].age, |