Rid W=1 warnings in Networking
Subsystems (16)
cover Rid W=1 warnings in Networking
This set is part of a larger effort attempting to clean-up W=1 kernel builds, which are currently overwhelmingly riddled with niggly little warnings.
There are quite a few W=1 warnings in the Networking code. My plan is to work through all of them over the next few weeks. Hopefully it won't be too long before drivers/net builds clean with W=1 enabled.
Lee Jones (30):
net: bonding: bond_3ad: Fix a bunch of kerneldoc parameter issues
net: bonding: bond_main: Document 'proto' and rename 'new_active'
parameters
net: ethernet: 3com: 3c574_cs: Remove set but unused variables 'tx'
and 'rx'
net: bonding: bond_alb: Describe
alb_handle_addr_collision_on_attach()'s 'bond' and 'addr' params
net: wireless: atmel: atmel: Demote non-kerneldoc header to standard
comment block
net: ethernet: 8390: axnet_cs: Document unused parameter 'txqueue'
net: wireless: broadcom: b43: main: Add braces around empty statements
net: wireless: ath: carl9170: Mark 'ar9170_qmap' as __maybe_unused
net: wireless: ath: ath5k: pcu: Add a description for 'band' remove
one for 'mode'
net: wan: dlci: Remove set but not used variable 'err'
net: wireless: cisco: airo: Place brackets around empty statement
net: wireless: cisco: airo: Fix a myriad of coding style issues
net: wireless: ath: wil6210: cfg80211: Demote non-kerneldoc headers to
standard comment blocks
net: wireless: intel: iwlegacy: common: Remove set but not used
variable 'len'
net: wireless: intel: iwlegacy: common: Demote kerneldoc headers to
standard comment blocks
net: wireless: intel: ipw2200: Remove set but unused variables 'rc'
and 'w'
net: wireless: broadcom: b43legacy: main: Provide braces around empty
'if' body
net: fddi: skfp: hwmtm: Remove seemingly unused variable 'ID_sccs'
net: fddi: skfp: fplustm: Remove seemingly unused variable 'ID_sccs'
net: wireless: ath: ath5k: base: Fix kerneldoc formatting issue
net: fddi: skfp: smt: Place definition of 'smt_pdef' under same
stipulations as its use
net: wireless: broadcom: brcm80211: brcmfmac: fweh: Remove set but
unused variable 'err'
net: wireless: broadcom: brcm80211: brcmfmac: fweh: Fix docrot related
function documentation issues
net: wireless: broadcom: brcm80211: brcmsmac: mac80211_if: Demote a
few non-conformant kerneldoc headers
net: wireless: intel: ipw2x00: ipw2200: Demote lots of nonconformant
kerneldoc comments
net: wireless: broadcom: b43: phy_common: Demote non-conformant
kerneldoc header
net: fddi: skfp: smt: Remove seemingly unused variable 'ID_sccs'
net: fddi: skfp: cfm: Remove set but unused variable 'oldstate'
net: fddi: skfp: cfm: Remove seemingly unused variable 'ID_sccs'
net: wireless: broadcom: b43: phy_n: Add empty braces around empty
statements
drivers/net/bonding/bond_3ad.c | 15 +- drivers/net/bonding/bond_alb.c | 4 +- drivers/net/bonding/bond_main.c | 4 +- drivers/net/ethernet/3com/3c574_cs.c | 6 +- drivers/net/ethernet/8390/axnet_cs.c | 1 + drivers/net/fddi/skfp/cfm.c | 17 +- drivers/net/fddi/skfp/fplustm.c | 4 - drivers/net/fddi/skfp/hwmtm.c | 4 - drivers/net/fddi/skfp/smt.c | 7 +- drivers/net/wan/dlci.c | 3 +- drivers/net/wireless/ath/ath5k/base.c | 2 +- drivers/net/wireless/ath/ath5k/pcu.c | 2 +- drivers/net/wireless/ath/carl9170/carl9170.h | 2 +- drivers/net/wireless/ath/wil6210/cfg80211.c | 4 +- drivers/net/wireless/atmel/atmel.c | 2 +- drivers/net/wireless/broadcom/b43/main.c | 6 +- .../net/wireless/broadcom/b43/phy_common.c | 2 +- drivers/net/wireless/broadcom/b43/phy_n.c | 19 +- .../net/wireless/broadcom/b43legacy/main.c | 3 +- .../broadcom/brcm80211/brcmfmac/fweh.c | 13 +- .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 11 +- drivers/net/wireless/cisco/airo.c | 898 +++++++++--------- drivers/net/wireless/intel/ipw2x00/ipw2200.c | 45 +- drivers/net/wireless/intel/iwlegacy/common.c | 72 +- 24 files changed, 582 insertions(+), 564 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/30 net: bonding: bond_3ad: Fix a bunch of kerneldoc parameter issues
Renames and missing descriptions.
Fixes the following W=1 kernel build warning(s):
drivers/net/bonding/bond_3ad.c:140: warning: Function parameter or member 'port' not described in '__get_first_agg' drivers/net/bonding/bond_3ad.c:140: warning: Excess function parameter 'bond' description in '__get_first_agg' drivers/net/bonding/bond_3ad.c:1655: warning: Function parameter or member 'agg' not described in 'ad_agg_selection_logic' drivers/net/bonding/bond_3ad.c:1655: warning: Excess function parameter 'aggregator' description in 'ad_agg_selection_logic' drivers/net/bonding/bond_3ad.c:1817: warning: Function parameter or member 'port' not described in 'ad_initialize_port' drivers/net/bonding/bond_3ad.c:1817: warning: Excess function parameter 'aggregator' description in 'ad_initialize_port' drivers/net/bonding/bond_3ad.c:1976: warning: Function parameter or member 'timeout' not described in 'bond_3ad_initiate_agg_selection' drivers/net/bonding/bond_3ad.c:2274: warning: Function parameter or member 'work' not described in 'bond_3ad_state_machine_handler' drivers/net/bonding/bond_3ad.c:2274: warning: Excess function parameter 'bond' description in 'bond_3ad_state_machine_handler' drivers/net/bonding/bond_3ad.c:2508: warning: Function parameter or member 'link' not described in 'bond_3ad_handle_link_change' drivers/net/bonding/bond_3ad.c:2508: warning: Excess function parameter 'status' description in 'bond_3ad_handle_link_change' drivers/net/bonding/bond_3ad.c:2566: warning: Function parameter or member 'bond' not described in 'bond_3ad_set_carrier' drivers/net/bonding/bond_3ad.c:2677: warning: Function parameter or member 'bond' not described in 'bond_3ad_update_lacp_rate' drivers/net/bonding/bond_3ad.c:1655: warning: Function parameter or member 'agg' not described in 'ad_agg_selection_logic' drivers/net/bonding/bond_3ad.c:1655: warning: Excess function parameter 'aggregator' description in 'ad_agg_selection_logic' drivers/net/bonding/bond_3ad.c:1817: warning: Function parameter or member 'port' not described in 'ad_initialize_port' drivers/net/bonding/bond_3ad.c:1817: warning: Excess function parameter 'aggregator' description in 'ad_initialize_port' drivers/net/bonding/bond_3ad.c:1976: warning: Function parameter or member 'timeout' not described in 'bond_3ad_initiate_agg_selection' drivers/net/bonding/bond_3ad.c:2274: warning: Function parameter or member 'work' not described in 'bond_3ad_state_machine_handler' drivers/net/bonding/bond_3ad.c:2274: warning: Excess function parameter 'bond' description in 'bond_3ad_state_machine_handler' drivers/net/bonding/bond_3ad.c:2508: warning: Function parameter or member 'link' not described in 'bond_3ad_handle_link_change' drivers/net/bonding/bond_3ad.c:2508: warning: Excess function parameter 'status' description in 'bond_3ad_handle_link_change' drivers/net/bonding/bond_3ad.c:2566: warning: Function parameter or member 'bond' not described in 'bond_3ad_set_carrier' drivers/net/bonding/bond_3ad.c:2677: warning: Function parameter or member 'bond' not described in 'bond_3ad_update_lacp_rate'
--- drivers/net/bonding/bond_3ad.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/net/bonding/bond_3ad.c +8 -7
@@ -130,7 +130,7 @@ static inline struct bonding *__get_bond_by_port(struct port *port)/** * __get_first_agg - get the first aggregator in the bond -* @bond: the bond we're looking at +* @port: the port we're looking at * * Return the aggregator of the first slave in @bond, or %NULL if it can't be * found.
@@ -1626,7 +1626,7 @@ static int agg_device_up(const struct aggregator *agg)/** * ad_agg_selection_logic - select an aggregation group for a team -* @aggregator: the aggregator we're looking at +* @agg: the aggregator we're looking at * @update_slave_arr: Does slave array need update? * * It is assumed that only one aggregator may be selected for a team.
@@ -1810,7 +1810,7 @@ static void ad_initialize_agg(struct aggregator *aggregator)/** * ad_initialize_port - initialize a given port's parameters -* @aggregator: the aggregator we're looking at +* @port: the port we're looking at * @lacp_fast: boolean. whether fast periodic should be used */ static void ad_initialize_port (struct port *port,int lacp_fast)
@@ -1967,6 +1967,7 @@ static void ad_marker_response_received(struct bond_marker *marker,/** * bond_3ad_initiate_agg_selection - initate aggregator selection * @bond: bonding struct +* @timeout: timeout value to set * * Set the aggregation selection timer, to initiate an agg selection in * the very near future. Called during first initialization, and during
@@ -2259,7 +2260,7 @@ void bond_3ad_update_ad_actor_settings(struct bonding *bond)/** * bond_3ad_state_machine_handler - handle state machines timeout -* @bond: bonding struct to work on +* @work: work context to fetch bonding struct to work on from * * The state machine handling concept in this module is to check every tick * which state machine should operate any function. The execution order is
@@ -2500,7 +2501,7 @@ void bond_3ad_adapter_speed_duplex_changed(struct slave *slave)/** * bond_3ad_handle_link_change - handle a slave's link status change indication * @slave: slave struct to work on -* @status: whether the link is now up or down +* @link: whether the link is now up or down * * Handle reselection of aggregator (if needed) for this port. */
@@ -2551,7 +2552,7 @@ void bond_3ad_handle_link_change(struct slave *slave, char link)/** * bond_3ad_set_carrier - set link state for bonding master -* @bond - bonding structure +* @bond: bonding structure * * if we have an active aggregator, we're up, if not, we're down. * Presumes that we cannot have an active aggregator if there are
@@ -2664,7 +2665,7 @@ int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond,/** * bond_3ad_update_lacp_rate - change the lacp rate -* @bond - bonding struct +* @bond: bonding struct * * When modify lacp_rate parameter via sysfs, * update actor_oper_port_state of each port.
Signature · 1 line
2.25.1
PATCH 2/30 net: bonding: bond_main: Document 'proto' and rename 'new_active' parameters
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/net/bonding/bond_main.c:329: warning: Function parameter or member 'proto' not described in 'bond_vlan_rx_add_vid' drivers/net/bonding/bond_main.c:362: warning: Function parameter or member 'proto' not described in 'bond_vlan_rx_kill_vid' drivers/net/bonding/bond_main.c:964: warning: Function parameter or member 'new_active' not described in 'bond_change_active_slave' drivers/net/bonding/bond_main.c:964: warning: Excess function parameter 'new' description in 'bond_change_active_slave'
--- drivers/net/bonding/bond_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/bonding/bond_main.c +3 -1
@@ -322,6 +322,7 @@ netdev_tx_t bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb,/** * bond_vlan_rx_add_vid - Propagates adding an id to slaves * @bond_dev: bonding net device that got called +* @proto: network protocol ID * @vid: vlan id being added */ static int bond_vlan_rx_add_vid(struct net_device *bond_dev,
@@ -355,6 +356,7 @@ static int bond_vlan_rx_add_vid(struct net_device *bond_dev,/** * bond_vlan_rx_kill_vid - Propagates deleting an id to slaves * @bond_dev: bonding net device that got called +* @proto: network protocol ID * @vid: vlan id being removed */ static int bond_vlan_rx_kill_vid(struct net_device *bond_dev,
@@ -948,7 +950,7 @@ static bool bond_should_notify_peers(struct bonding *bond)/** * change_active_interface - change the active slave into the specified one * @bond: our bonding struct -* @new: the new slave to make the active one +* @new_active: the new slave to make the active one * * Set the new slave to the bond's settings and unset them on the old * curr_active_slave.
Signature · 1 line
2.25.1
PATCH 3/30 net: ethernet: 3com: 3c574_cs: Remove set but unused variables 'tx' and 'rx'
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/net/ethernet/3com/3c574_cs.c: In function ‘update_stats’:
drivers/net/ethernet/3com/3c574_cs.c:954:9: warning: variable ‘tx’ set but not used [-Wunused-but-set-variable] 954 | u8 rx, tx, up;
| ^~
drivers/net/ethernet/3com/3c574_cs.c:954:5: warning: variable ‘rx’ set but not used [-Wunused-but-set-variable] 954 | u8 rx, tx, up;
| ^~
--- drivers/net/ethernet/3com/3c574_cs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/3com/3c574_cs.c +3 -3
@@ -951,7 +951,7 @@ static struct net_device_stats *el3_get_stats(struct net_device *dev)static void update_stats (struct net_device *dev) {unsigned int ioaddr = dev->base_addr; -u8 rx, tx, up; +u8 up;pr_debug ("%s: updating the statistics.\n" , dev->name);
@@ -972,8 +972,8 @@ static void update_stats(struct net_device *dev) dev->stats.tx_packets += (up&0x30 ) <<4 ;/* Rx packets */ inb (ioaddr +7 );/* Tx deferrals */ inb (ioaddr +8 ); - rx =inw (ioaddr +10 ); - tx =inw (ioaddr +12 ); +/* rx */ inw (ioaddr +10 ); +/* tx */ inw (ioaddr +12 );EL3WINDOW (4 );/* BadSSD */ inb (ioaddr +12 );
Signature · 1 line
2.25.1
PATCH 4/30 net: bonding: bond_alb: Describe alb_handle_addr_collision_on_attach()'s 'bond' and 'addr' params
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/net/bonding/bond_alb.c:1222: warning: Function parameter or member 'bond' not described in 'alb_set_mac_address'
--- drivers/net/bonding/bond_alb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/bonding/bond_alb.c +2 -2
@@ -1206,8 +1206,8 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav/** * alb_set_mac_address -* @bond: -* @addr: +* @bond: bonding we're working on +* @addr: MAC address to set * * In TLB mode all slaves are configured to the bond's hw address, but set * their dev_addr field to different addresses (based on their permanent hw
Signature · 1 line
2.25.1
PATCH 5/30 net: wireless: atmel: atmel: Demote non-kerneldoc header to standard comment block
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/net/wireless/atmel/atmel.c:4232: warning: Cannot understand This file is part of net.russotto.AtmelMACFW, hereto referred to
--- drivers/net/wireless/atmel/atmel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/atmel/atmel.c +1 -1
@@ -4228,7 +4228,7 @@ static void atmel_wmem32(struct atmel_private *priv, u16 pos, u32 data)/* Copyright 2003 Matthew T. Russotto */ /* But derived from the Atmel 76C502 firmware written by Atmel and */ /* included in "atmel wireless lan drivers" package */ -/** +/* This file is part of net.russotto.AtmelMACFW, hereto referred to as AtmelMACFW
Signature · 1 line
2.25.1
Re: [PATCH 05/30] atmel: Demote non-kerneldoc header to standard comment block
Quoted 11 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/net/wireless/atmel/atmel.c:4232: warning: Cannot understand This file is part of net.russotto.AtmelMACFW, hereto referred toCc Simon Kelley <[email protected]>Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Signed-off-by Lee Jones <[email protected]>
14 patches applied to wireless-drivers-next.git, thanks.
68fd3030ad67 atmel: Demote non-kerneldoc header to standard comment block 64847777d05a b43: main: Add braces around empty statements 0b6a4247dea7 airo: Place brackets around empty statementba4d65132922 airo: Fix a myriad of coding style issues0171c6185c8f iwlegacy: common: Remove set but not used variable 'len' 9bafe8b82306 iwlegacy: common: Demote kerneldoc headers to standard comment blocks b2e732081f19 ipw2200: Remove set but unused variables 'rc' and 'w' 6214ef8a532f b43legacy: main: Provide braces around empty 'if' body 10c3ba7dbe6e brcmfmac: fweh: Remove set but unused variable 'err' 4e124e1fee6d brcmfmac: fweh: Fix docrot related function documentation issues 7eae8c732977 brcmsmac: mac80211_if: Demote a few non-conformant kerneldoc headers 5f442fe435e1 ipw2200: Demote lots of nonconformant kerneldoc comments c171304b42f9 b43: phy_common: Demote non-conformant kerneldoc header 5ae6c8a696cd b43: phy_n: Add empty braces around empty statements
Signature · 3 lines
https://patchwork.kernel.org/patch/11714411/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH 6/30 net: ethernet: 8390: axnet_cs: Document unused parameter 'txqueue'
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/net/ethernet/8390/axnet_cs.c:907: warning: Function parameter or member 'txqueue' not described in 'axnet_tx_timeout'
--- drivers/net/ethernet/8390/axnet_cs.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/8390/axnet_cs.c +1 -0
@@ -898,6 +898,7 @@ static int ax_close(struct net_device *dev)/** * axnet_tx_timeout - handle transmit time out condition * @dev: network device which has apparently fallen asleep +* @txqueue: unused * * Called by kernel when device never acknowledges a transmit has * completed (or failed) - i.e. never posted a Tx related interrupt.
Signature · 1 line
2.25.1
PATCH 7/30 net: wireless: broadcom: b43: main: Add braces around empty statements
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/net/wireless/broadcom/b43/main.c: In function ?b43_dummy_transmission?:
drivers/net/wireless/broadcom/b43/main.c:785:3: warning: suggest braces around empty body in an ?if? statement [-Wempty-body] drivers/net/wireless/broadcom/b43/main.c: In function ?b43_do_interrupt_thread?:
drivers/net/wireless/broadcom/b43/main.c:2017:3: warning: suggest braces around empty body in an ?if? statement [-Wempty-body]
--- drivers/net/wireless/broadcom/b43/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/broadcom/b43/main.c +4 -2
@@ -781,8 +781,9 @@ void b43_dummy_transmission(struct b43_wldev *dev, bool ofdm, bool pa_on)b43_write16 (dev,B43_MMIO_XMTSEL ,0x0826 );b43_write16 (dev,B43_MMIO_TXE0_CTL ,0x0000 ); -if (!pa_on && phy->type ==B43_PHYTYPE_N ) +if (!pa_on && phy->type ==B43_PHYTYPE_N ) { ;/*b43_nphy_pa_override(dev, false) */ + }switch (phy->type) {case B43_PHYTYPE_N :
@@ -2013,8 +2014,9 @@ static void b43_do_interrupt_thread(struct b43_wldev *dev)handle_irq_beacon (dev);if (reason &B43_IRQ_PMQ )handle_irq_pmq (dev); -if (reason &B43_IRQ_TXFIFO_FLUSH_OK ) +if (reason &B43_IRQ_TXFIFO_FLUSH_OK ) { ;/* TODO */ + }if (reason &B43_IRQ_NOISESAMPLE_OK )handle_irq_noise (dev);
Signature · 1 line
2.25.1
Re: [PATCH 07/30] net: wireless: broadcom: b43: main: Add braces around empty statements
Quoted 20 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/net/wireless/broadcom/b43/main.c: In function ?b43_dummy_transmission?:
drivers/net/wireless/broadcom/b43/main.c:785:3: warning: suggest braces around empty body in an ?if? statement [-Wempty-body]drivers/net/wireless/broadcom/b43/main.c: In function ?b43_do_interrupt_thread?:
drivers/net/wireless/broadcom/b43/main.c:2017:3: warning: suggest braces around empty body in an ?if? statement [-Wempty-body]Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Martin Langer <[email protected]>Cc Stefano Brivio <[email protected]>Cc Michael Buesch <[email protected]>Cc van Dyk <[email protected]>Cc Andreas Jaggi <[email protected]>Cc Albert Herranz <[email protected]>Cc linux-wireless at vger.kernel.orgCc b43-dev at lists.infradead.orgCc netdev at vger.kernel.orgSigned-off-by Lee Jones <[email protected]>
Quoted 3 lines
--- drivers/net/wireless/broadcom/b43/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Please don't copy the full directory structure to the title. I'll change the title to more simple version:
b43: add braces around empty statements
I'll do similar changes to other wireless-drivers patches.
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH 07/30] net: wireless: broadcom: b43: main: Add braces around empty statements
Quoted 26 lines · Kalle Valo
Quoted 20 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/net/wireless/broadcom/b43/main.c: In function ?b43_dummy_transmission?:
drivers/net/wireless/broadcom/b43/main.c:785:3: warning: suggest braces around empty body in an ?if? statement [-Wempty-body]drivers/net/wireless/broadcom/b43/main.c: In function ?b43_do_interrupt_thread?:
drivers/net/wireless/broadcom/b43/main.c:2017:3: warning: suggest braces around empty body in an ?if? statement [-Wempty-body]Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Martin Langer <[email protected]>Cc Stefano Brivio <[email protected]>Cc Michael Buesch <[email protected]>Cc van Dyk <[email protected]>Cc Andreas Jaggi <[email protected]>Cc Albert Herranz <[email protected]>Cc linux-wireless at vger.kernel.orgCc b43-dev at lists.infradead.orgCc netdev at vger.kernel.orgSigned-off-by Lee Jones <[email protected]>Quoted 3 lines
--- drivers/net/wireless/broadcom/b43/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Quoted 4 lines
Please don't copy the full directory structure to the title. I'll change the title to more simple version:
b43: add braces around empty statements
This seems to go the other way.
"net: wireless: b43" seems sensible.
Quoted 1 line
I'll do similar changes to other wireless-drivers patches.
Thanks.
Does that mean it's been applied, or is this future tense?
Signature · 4 lines
Lee Jones [???] Senior Technical Lead - Developer Services Linaro.org ? Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 07/30] net: wireless: broadcom: b43: main: Add braces around empty statements
Quoted 30 lines · Lee Jones
Quoted 28 lines · Kalle Valo
Quoted 25 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/net/wireless/broadcom/b43/main.c: In function ?b43_dummy_transmission?:
drivers/net/wireless/broadcom/b43/main.c:785:3: warning: suggest
braces around empty body in an ?if? statement [-Wempty-body]
drivers/net/wireless/broadcom/b43/main.c: In function ?b43_do_interrupt_thread?:
drivers/net/wireless/broadcom/b43/main.c:2017:3: warning: suggest
braces around empty body in an ?if? statement [-Wempty-body]Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Martin Langer <[email protected]>Cc Stefano Brivio <[email protected]>Cc Michael Buesch <[email protected]>Cc van Dyk <[email protected]>Cc Andreas Jaggi <[email protected]>Cc Albert Herranz <[email protected]>Cc linux-wireless at vger.kernel.orgCc b43-dev at lists.infradead.orgCc netdev at vger.kernel.orgSigned-off-by Lee Jones <[email protected]>--- drivers/net/wireless/broadcom/b43/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Quoted 8 lines
Quoted 4 lines
Please don't copy the full directory structure to the title. I'll change the title to more simple version:
b43: add braces around empty statements
This seems to go the other way.
"net: wireless: b43" seems sensible.
Sorry, not understanding what you mean here.
Quoted 5 lines
Quoted 1 line
I'll do similar changes to other wireless-drivers patches.
Thanks.
Does that mean it's been applied, or is this future tense?
It's not applied yet, there will be an automatic "applied" email once I have done that.
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH 07/30] net: wireless: broadcom: b43: main: Add braces around empty statements
Quoted 35 lines · Kalle Valo
Quoted 33 lines · Lee Jones
Quoted 31 lines · Kalle Valo
Quoted 22 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/net/wireless/broadcom/b43/main.c: In function ?b43_dummy_transmission?:
drivers/net/wireless/broadcom/b43/main.c:785:3: warning: suggest
braces around empty body in an ?if? statement [-Wempty-body]
drivers/net/wireless/broadcom/b43/main.c: In function ?b43_do_interrupt_thread?:
drivers/net/wireless/broadcom/b43/main.c:2017:3: warning: suggest
braces around empty body in an ?if? statement [-Wempty-body]Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Martin Langer <[email protected]>Cc Stefano Brivio <[email protected]>Cc Michael Buesch <[email protected]>Cc van Dyk <[email protected]>Cc Andreas Jaggi <[email protected]>Cc Albert Herranz <[email protected]>Cc linux-wireless at vger.kernel.orgCc b43-dev at lists.infradead.orgCc netdev at vger.kernel.orgSigned-off-by Lee Jones <[email protected]>Quoted 3 lines
--- drivers/net/wireless/broadcom/b43/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)Please don't copy the full directory structure to the title. I'll change the title to more simple version:
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
b43: add braces around empty statements
This seems to go the other way.
"net: wireless: b43" seems sensible.
Sorry, not understanding what you mean here.
So I agree that:
"net: wireless: broadcom: b43: main"
... seems unnecessarily long and verbose. However, IMHO:
"b43:"
... is too short and not forthcoming enough. Obviously this fine when something like git log -- net/wireless, as you already know what the patch pertains to, however when someone who is not in the know (like I would be) does git log and sees a "b43:" patch, they would have no idea which subsystem this patch is adapting. Even:
"wireless: b43:"
... would be worlds better.
A Git log which omitted all subsystem tags would be of limited use.
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
I'll do similar changes to other wireless-drivers patches.
Thanks.
Does that mean it's been applied, or is this future tense?
It's not applied yet, there will be an automatic "applied" email once I have done that.
I see. Thanks for the clarification.
Signature · 4 lines
Lee Jones [???] Senior Technical Lead - Developer Services Linaro.org ? Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 07/30] net: wireless: broadcom: b43: main: Add braces around empty statements
Quoted 59 lines · Lee Jones
Quoted 35 lines · Kalle Valo
Quoted 33 lines · Lee Jones
Quoted 31 lines · Kalle Valo
Quoted 22 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/net/wireless/broadcom/b43/main.c: In function ?b43_dummy_transmission?:
drivers/net/wireless/broadcom/b43/main.c:785:3: warning: suggest
braces around empty body in an ?if? statement [-Wempty-body]
drivers/net/wireless/broadcom/b43/main.c: In function ?b43_do_interrupt_thread?:
drivers/net/wireless/broadcom/b43/main.c:2017:3: warning: suggest
braces around empty body in an ?if? statement [-Wempty-body]Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Martin Langer <[email protected]>Cc Stefano Brivio <[email protected]>Cc Michael Buesch <[email protected]>Cc van Dyk <[email protected]>Cc Andreas Jaggi <[email protected]>Cc Albert Herranz <[email protected]>Cc linux-wireless at vger.kernel.orgCc b43-dev at lists.infradead.orgCc netdev at vger.kernel.orgSigned-off-by Lee Jones <[email protected]>Quoted 3 lines
--- drivers/net/wireless/broadcom/b43/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)Please don't copy the full directory structure to the title. I'll change the title to more simple version:
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
b43: add braces around empty statements
This seems to go the other way.
"net: wireless: b43" seems sensible.
Sorry, not understanding what you mean here.
So I agree that:
"net: wireless: broadcom: b43: main"
... seems unnecessarily long and verbose. However, IMHO:
"b43:"
... is too short and not forthcoming enough. Obviously this fine when something like
git log -- net/wireless, as you already know what the patch pertains to, however when someone who is not in the know (like I would be) doesgit logand sees a "b43:" patch, they would have no idea which subsystem this patch is adapting. Even:
Quoted 5 lines
"wireless: b43:"
... would be worlds better.
A Git log which omitted all subsystem tags would be of limited use.
There are good reasons why the style is like it is. If I would start adding "wireless:" tags to the title it would clutter 'git log --oneline' and gitk output, which I use all the time. And I'm not interested making my work harder, there would need to be really strong reasons why I would even recondiser changing it.
BTW, this is also documented in our wiki:
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#commit_title_is_wrong
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH 07/30] net: wireless: broadcom: b43: main: Add braces around empty statements
Quoted 73 lines · Kalle Valo
Quoted 59 lines · Lee Jones
Quoted 35 lines · Kalle Valo
Quoted 33 lines · Lee Jones
Quoted 31 lines · Kalle Valo
Quoted 22 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/net/wireless/broadcom/b43/main.c: In function ?b43_dummy_transmission?:
drivers/net/wireless/broadcom/b43/main.c:785:3: warning: suggest
braces around empty body in an ?if? statement [-Wempty-body]
drivers/net/wireless/broadcom/b43/main.c: In function ?b43_do_interrupt_thread?:
drivers/net/wireless/broadcom/b43/main.c:2017:3: warning: suggest
braces around empty body in an ?if? statement [-Wempty-body]Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Martin Langer <[email protected]>Cc Stefano Brivio <[email protected]>Cc Michael Buesch <[email protected]>Cc van Dyk <[email protected]>Cc Andreas Jaggi <[email protected]>Cc Albert Herranz <[email protected]>Cc linux-wireless at vger.kernel.orgCc b43-dev at lists.infradead.orgCc netdev at vger.kernel.orgSigned-off-by Lee Jones <[email protected]>Quoted 3 lines
--- drivers/net/wireless/broadcom/b43/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)Please don't copy the full directory structure to the title. I'll change the title to more simple version:
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
b43: add braces around empty statements
This seems to go the other way.
"net: wireless: b43" seems sensible.
Sorry, not understanding what you mean here.
So I agree that:
"net: wireless: broadcom: b43: main"
... seems unnecessarily long and verbose. However, IMHO:
"b43:"
... is too short and not forthcoming enough. Obviously this fine when something like
git log -- net/wireless, as you already know what the patch pertains to, however when someone who is not in the know (like I would be) doesgit logand sees a "b43:" patch, they would have no idea which subsystem this patch is adapting. Even:Quoted 5 lines
"wireless: b43:"
... would be worlds better.
A Git log which omitted all subsystem tags would be of limited use.
There are good reasons why the style is like it is. If I would start adding "wireless:" tags to the title it would clutter 'git log --oneline' and gitk output, which I use all the time. And I'm not interested making my work harder, there would need to be really strong reasons why I would even recondiser changing it.
Quoted 3 lines
BTW, this is also documented in our wiki:
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#commit_title_is_wrong
Documented or otherwise, it's still odd.
Yes, it's okay for *you* being the Maintainer of Wireless, but by keeping your own workspace clutter free you obfuscate the git log for everyone else.
I can't find another subsystem that does this:
lee at dell:~/projects/linux/kernel [tb-fix-w1-warnings]$ git log --oneline --follow --no-merges -5 drivers/scsi | cat 0c1a65a347227 scsi: pm8001: pm8001_hwi: Remove unused variable 'value'beccf4070cabd scsi: pm8001: pm8001_sas: Fix strncpy() warning50e619cb0966b scsi: arcmsr: arcmsr_hba: Make room for the trailing NULL, even if it is over-written 9c6c4a4606ecf scsi: megaraid: megaraid_sas_base: Provide prototypes for non-static functions 32417d7844ab0 scsi: esas2r: Remove unnecessary casts
lee at dell:~/projects/linux/kernel [tb-fix-w1-warnings]$ git log --oneline --follow --no-merges -5 drivers/i2c | cat ab70935d37bbd i2c: Remove 'default n' from busses/Kconfig0204081128d58 i2c: iproc: Fix shifting 31 bits914a7b3563b8f i2c: rcar: in slave mode, clear NACK earliere4682b8a688bc i2c: acpi: Remove dead code, i.e. i2c_acpi_match_device()e3cb82c6d6f6c i2c: core: Don't fail PRP0001 enumeration when no ID table exist
lee at dell:~/projects/linux/kernel [tb-fix-w1-warnings]$ git log --oneline --follow --no-merges -5 drivers/spi | cat b0e37c5157332 spi: spi-fsl-espi: Remove use of %p2ea370a9173f4 spi: spi-cadence-quadspi: Populate get_name() interface20c05a0550636 spi: spi-fsl-dspi: delete EOQ transfer modedf561f6688fef treewide: Use fallthrough pseudo-keywordc76964e810a55 spi: imx: Remove unneeded probe message
lee at dell:~/projects/linux/kernel [tb-fix-w1-warnings]$ git log --oneline --follow --no-merges -5 drivers/nfc/ | cat f97c04c316d8f NFC: st95hf: Fix memleak in st95hf_in_send_cmddf561f6688fef treewide: Use fallthrough pseudo-keywordf8c931f3be8dd nfc: st21nfca: Remove unnecessary cast0eddbef6489cf nfc: st-nci: Remove unnecessary cast1e8fd3a97f2d8 nfc: s3fwrn5: add missing release on skb in s3fwrn5_recv_frame
lee at dell:~/projects/linux/kernel [tb-fix-w1-warnings]$ git log --oneline --follow --no-merges -5 drivers/misc | cat e19e862938acf misc: ocxl: config: Rename function attribute descriptionca99b8bdf84ef misc: c2port: core: Make copying name from userspace more secure99363d1c26c82 eeprom: at24: Tidy at24_read()df561f6688fef treewide: Use fallthrough pseudo-keyword5aba368893c0d habanalabs: correctly report inbound pci region cfg error
lee at dell:~/projects/linux/kernel [tb-fix-w1-warnings]$ git log --oneline --follow --no-merges -5 drivers/iio | cat fc2404e94d3fb iio: industrialio-trigger: Use 'gnu_printf' format notatione4130d150831b iio: imu: adis16400: Provide description for missing struct attribute 'avail_scan_mask' 4a6b899005ef5 iio: adc: mcp320x: Change ordering of compiler attribute macro96d7124f00e62 iio: gyro: adxrs450: Change ordering of compiler attribute macro21ef78342f557 iio: resolver: ad2s1200: Change ordering of compiler attribute macro
lee at dell:~/projects/linux/kernel [tb-fix-w1-warnings]$ git log --oneline --follow --no-merges -5 drivers/firmware/ | cat 9bbb6d7de490a efi/fake_mem: arrange for a resource entry per efi_fake_mem instancef75fa0a51b8b5 efi: Rename arm-init to efi-init common for all arch92efdc54a2c04 RISC-V: Add EFI stub support.8a8a3237a78cb efi/libstub: Handle unterminated cmdlinea37ca6a2af9df efi/libstub: Handle NULL cmdline
lee at dell:~/projects/linux/kernel [tb-fix-w1-warnings]$ git log --oneline --follow --no-merges -5 drivers/remoteproc/ | cat df561f6688fef treewide: Use fallthrough pseudo-keyword62b8f9e99329c remoteproc: core: Register the character device interface4476770881d7a remoteproc: Add remoteproc character device interface2f3ee5e481ce8 remoteproc: kill IPA notify code87218f96c21a9 remoteproc: k3-dsp: Add support for C71x DSPs
lee at dell:~/projects/linux/kernel [tb-fix-w1-warnings]$ git log --oneline --follow --no-merges -5 drivers/dma | cat 78a2f92e4c4a3 dmaengine: axi-dmac: add support for reading bus attributes from registers 3061a65c1b3db dmaengine: axi-dmac: wrap channel parameter adjust into function06b6e88c7ecf4 dmaengine: axi-dmac: wrap entire dt parse in a function08b36dba23e5b dmaengine: axi-dmac: move clock enable earliera88fdece44d40 dmaengine: axi-dmac: move active_descs list init after device-tree init
lee at dell:~/projects/linux/kernel [tb-fix-w1-warnings]$ git log --oneline --follow --no-merges -5 drivers/clk | cat 0b8056106c02b clk: imx: vf610: Add CRC clock7d6b5e4f24457 clk: imx: Explicitly include bits.he0d0d4d86c766 clk: imx8qxp: Support building i.MX8QXP clock driver as module9a976cd278eaf clk: imx8m: Support module buildf1f018dc030ed clk: imx: Add clock configuration for ARMv7 platforms
lee at dell:~/projects/linux/kernel [tb-fix-w1-warnings]$ git log --oneline --follow --no-merges -5 drivers/crypto | cat 3033fd177bcc3 crypto: stm32 - Add missing header inclusionsdf561f6688fef treewide: Use fallthrough pseudo-keyword1b77be463929e crypto/chcr: Moving chelsio's inline ipsec functionality to /drivers/net44fd1c1fd8219 chelsio/chtls: separate chelsio tls driver from crypto driver3d29e98d1d755 crypto: hisilicon/qm - fix the process of register algorithms to crypto
Signature · 4 lines
Lee Jones [???] Senior Technical Lead - Developer Services Linaro.org ? Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH 8/30 net: wireless: ath: carl9170: Mark 'ar9170_qmap' as __maybe_unused
In reply to Lee Jones'ar9170_qmap' is used in some source files which include carl9170.h, but not all of them. Mark it as __maybe_unused to show that this is not only okay, it's expected.
Fixes the following W=1 kernel build warning(s)
from drivers/net/wireless/ath/carl9170/carl9170.h:57,
In file included from drivers/net/wireless/ath/carl9170/carl9170.h:57, drivers/net/wireless/ath/carl9170/carl9170.h:71:17: warning: ‘ar9170_qmap’ defined but not used [-Wunused-const-variable=]
NB: Snipped - lots of these repeat
--- drivers/net/wireless/ath/carl9170/carl9170.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/carl9170/carl9170.h +1 -1
@@ -68,7 +68,7 @@#define PAYLOAD_MAX (CARL9170_MAX_CMD_LEN / 4 - 1) -static const u8 ar9170_qmap[__AR9170_NUM_TXQ] = {3 ,2 ,1 ,0 }; +static const u8 __maybe_unused ar9170_qmap[__AR9170_NUM_TXQ] = {3 ,2 ,1 ,0 };#define CARL9170_MAX_RX_BUFFER_SIZE 8192
Signature · 1 line
2.25.1
Re: [PATCH 08/30] net: wireless: ath: carl9170: Mark 'ar9170_qmap' as __maybe_unused
Quoted 5 lines · Lee Jones
'
ar9170_qmap' is used in some source files which includecarl9170.h, but not all of them. Mark it as__maybe_unusedto show that this is not only okay, it's expected.Fixes the following W=1 kernel build warning(s)
Is this W=1 really a "must" requirement? I find it strange having __maybe_unused in header files as this "suggests" that the definition is redundant.
Quoted 33 lines
from
drivers/net/wireless/ath/carl9170/carl9170.h:57,
In file included fromdrivers/net/wireless/ath/carl9170/carl9170.h:57,drivers/net/wireless/ath/carl9170/carl9170.h:71:17: warning: ‘ar9170_qmap’ defined but not used [-Wunused-const-variable=]Cc Christian Lamparter <[email protected]>Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Johannes Berg <[email protected]>Signed-off-by Lee Jones <[email protected]>--- drivers/net/wireless/ath/carl9170/carl9170.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/wireless/ath/carl9170/carl9170.h +1
-1@@ -68,7 +68,7 @@#define PAYLOAD_MAX (CARL9170_MAX_CMD_LEN / 4 - 1) -static const u8 ar9170_qmap[__AR9170_NUM_TXQ] = {3 ,2 ,1 ,0 }; +static const u8 __maybe_unused ar9170_qmap[__AR9170_NUM_TXQ] = {3 ,2 ,1 ,0 };#define CARL9170_MAX_RX_BUFFER_SIZE 8192
Re: [PATCH 08/30] net: wireless: ath: carl9170: Mark 'ar9170_qmap' as __maybe_unused
Quoted 8 lines · Christian Lamparter
Quoted 5 lines · Lee Jones
'
ar9170_qmap' is used in some source files which includecarl9170.h, but not all of them. Mark it as__maybe_unusedto show that this is not only okay, it's expected.Fixes the following W=1 kernel build warning(s)
Is this W=1 really a "must" requirement? I find it strange having
Clean W=1 warnings is the dream, yes.
I would have thought most Maintainers would be on-board with this.
The ones I've worked with thus far have certainly been thankful. Many had this on their own TODO lists.
Quoted 2 lines
__maybe_unusedin header files as this "suggests" that the definition is redundant.
Not true.
If it were redundant then we would remove the line entirely.
Quoted 27 lines
Quoted 26 lines
from
drivers/net/wireless/ath/carl9170/carl9170.h:57,
In file included fromdrivers/net/wireless/ath/carl9170/carl9170.h:57,drivers/net/wireless/ath/carl9170/carl9170.h:71:17: warning: ‘ar9170_qmap’ defined but not used [-Wunused-const-variable=]Cc Christian Lamparter <[email protected]>Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Johannes Berg <[email protected]>Signed-off-by Lee Jones <[email protected]>--- drivers/net/wireless/ath/carl9170/carl9170.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/wireless/ath/carl9170/carl9170.h +1
-1@@ -68,7 +68,7 @@#define PAYLOAD_MAX (CARL9170_MAX_CMD_LEN / 4 - 1) -static const u8 ar9170_qmap[__AR9170_NUM_TXQ] = {3 ,2 ,1 ,0 }; +static const u8 __maybe_unused ar9170_qmap[__AR9170_NUM_TXQ] = {3 ,2 ,1 ,0 };#define CARL9170_MAX_RX_BUFFER_SIZE 8192
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 08/30] net: wireless: ath: carl9170: Mark 'ar9170_qmap' as __maybe_unused
Quoted 7 lines · Lee Jones
Quoted 5 lines · Christian Lamparter
Quoted 4 lines · Lee Jones
'
ar9170_qmap' is used in some source files which includecarl9170.h, but not all of them. Mark it as__maybe_unusedto show that this is not only okay, it's expected.
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Fixes the following W=1 kernel build warning(s)
Is this W=1 really a "must" requirement? I find it strange having
Clean W=1 warnings is the dream, yes.
But is it a requirement?
Quoted 2 lines
I would have thought most Maintainers would be on-board with this.
From what I know: It's no changes For changes' sake. Because otherwise this would be pretty broken for maintainers. They could just write and revert the same code over and over to prob up their LOC and commit counter. Wouldn't you agree there?
Quoted 3 lines
The ones I've worked with thus far have certainly been thankful. Many had this on their own TODO lists.
Question is, do you really want to be just the cleanup crew there? Since semantic patches came along and a lot of this has been automated.
I'm of course after something else. Like: "Isn't there a better way than manually slapping __maybe_unused there to suppress the warning and call it a day?" If you already went down these avenues and can confirm that there's no alternative than this, then "fine". But if there is a better method of doing this, then "let's go with that!".
Quoted 7 lines
Quoted 3 lines
__maybe_unusedin header files as this "suggests" that the definition is redundant.Not true.
If it were redundant then we would remove the line entirely.
So, why adding __maybe_unused then? I find it not very helpful to tell the compiler to "shut up" when you want it's opinion... This was the vibe I got from gcc's attribute unused help text.
Cheers,
Christian
Quoted 29 lines
Quoted 28 lines
Quoted 27 lines
from drivers/net/wireless/ath/carl9170/carl9170.h:57, In file included from drivers/net/wireless/ath/carl9170/carl9170.h:57, drivers/net/wireless/ath/carl9170/carl9170.h:71:17: warning: ‘ar9170_qmap’ defined but not used [-Wunused-const-variable=]Cc Christian Lamparter <[email protected]>Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Johannes Berg <[email protected]>Signed-off-by Lee Jones <[email protected]>--- drivers/net/wireless/ath/carl9170/carl9170.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/wireless/ath/carl9170/carl9170.h +1
-1@@ -68,7 +68,7 @@#define PAYLOAD_MAX (CARL9170_MAX_CMD_LEN / 4 - 1) -static const u8 ar9170_qmap[__AR9170_NUM_TXQ] = {3 ,2 ,1 ,0 }; +static const u8 __maybe_unused ar9170_qmap[__AR9170_NUM_TXQ] = {3 ,2 ,1 ,0 };#define CARL9170_MAX_RX_BUFFER_SIZE 8192
Re: [PATCH 08/30] net: wireless: ath: carl9170: Mark 'ar9170_qmap' as __maybe_unused
Quoted 8 lines · Christian Lamparter
Quoted 7 lines · Lee Jones
Quoted 5 lines · Christian Lamparter
Quoted 4 lines · Lee Jones
'
ar9170_qmap' is used in some source files which includecarl9170.h, but not all of them. Mark it as__maybe_unusedto show that this is not only okay, it's expected.
Quoted 6 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Fixes the following W=1 kernel build warning(s)
Is this W=1 really a "must" requirement? I find it strange having
Clean W=1 warnings is the dream, yes.
But is it a requirement?
Depends how you define a requirement.
This is required to successfully and usefully enable W=1 warnings in our testing builds without being overloaded with current issues. Something I know a great number of maintainers have been either trying to do, or at least wanting to do for a long time.
Being able to enable W=1 builds at the subsystem level is extremely helpful in order to keep the kernel clean(er). As most subsystems don't (can't) have them enabled presently (due to being overwhelmed) they will likely creep/increase.
So far, the following subsystems have been on-board with this (and are now clean, or very nearly clean, as a result):
ASoC
backlight
cpufreq
dmaengine
gpio
hwmon
iio
mfd
misc
mmc
pinctrl
pwm
regulator
remoteproc
scsi
spi
usb
video
Quoted 5 lines
Quoted 1 line
I would have thought most Maintainers would be on-board with this.
From what I know: It's no changes For changes' sake. Because otherwise this would be pretty broken for maintainers. They could just write and revert the same code over and over to prob up their LOC and commit counter. Wouldn't you agree there?
I don't agree at all. Why would anyone revert a fix? That act would be intentionally add a warning? A fools errand I think.
Quoted 4 lines
Quoted 2 lines
The ones I've worked with thus far have certainly been thankful. Many had this on their own TODO lists.
Question is, do you really want to be just the cleanup crew there? Since semantic patches came along and a lot of this has been automated.
I'm happy to put in the work. Most people have been very grateful.
If this work can be automated, than that would be wonderful. However, 18000 warnings (now down to 15000) tell me that this can not be the case.
Quoted 5 lines
I'm of course after something else. Like: "Isn't there a better way than manually slapping
__maybe_unusedthere to suppress the warning and call it a day?" If you already went down these avenues and can confirm that there's no alternative than this, then "fine". But if there is a better method of doing this, then "let's go with that!".
So for these kinds of issues we have a choice.
In order of preference:
1. Genuinely unused; remove it
2. Used in a single location; move it to that location
3. Used in multiple, but not all locations:
a. Mark as __maybe_unused
b. Locate or create a special header file between users b. Duplicate it and place it in all used locations
I went for 3a here, as 1 and 2 aren't valid.
Quoted 9 lines
Quoted 6 lines
Quoted 2 lines
__maybe_unusedin header files as this "suggests" that the definition is redundant.Not true.
If it were redundant then we would remove the line entirely.
So, why adding
__maybe_unusedthen? I find it not very helpful to tell the compiler to "shut up" when you want it's opinion... This was the vibe I got from gcc's attribute unused help text.
Effectively, you're telling the compiler that it's not correct in certain circumstances, like this one. Here the variable is being used, but not by all users who share the header file. In other valid cases of its use the variable may only be used when a given CONFIG_* is enabled.
__always_unused however does just tell the compiler to shut-up. :)
If you have any better solutions, other than to let the compiler spout useless warnings which taint the build log and hide other, more important issues, then I'd be happy to hear them.
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 08/30] net: wireless: ath: carl9170: Mark 'ar9170_qmap' as __maybe_unused
In reply to Christian LamparterQuoted 10 lines · Christian Lamparter
Quoted 5 lines · Lee Jones
'
ar9170_qmap' is used in some source files which includecarl9170.h, but not all of them. Mark it as__maybe_unusedto show that this is not only okay, it's expected.Fixes the following W=1 kernel build warning(s)
Is this W=1 really a "must" requirement? I find it strange having
__maybe_unusedin header files as this "suggests" that the definition is redundant.
In this case it seems one could replace the table lookup with a
static inline u8 ar9170_qmap(u8 idx) { return 3 - idx; }
gcc doesn't warn about unused static inline functions (or one would have a million warnings to deal with). Just my $0.02.
Rasmus
Re: [PATCH 08/30] net: wireless: ath: carl9170: Mark 'ar9170_qmap' as __maybe_unused
Quoted 12 lines · Rasmus Villemoes
Quoted 10 lines · Christian Lamparter
Quoted 5 lines · Lee Jones
'
ar9170_qmap' is used in some source files which includecarl9170.h, but not all of them. Mark it as__maybe_unusedto show that this is not only okay, it's expected.Fixes the following W=1 kernel build warning(s)
Is this W=1 really a "must" requirement? I find it strange having
__maybe_unusedin header files as this "suggests" that the definition is redundant.
Quoted 6 lines
In this case it seems one could replace the table lookup with a
static inline u8
ar9170_qmap(u8 idx){ return 3 - idx; }gcc doesn't warn about unused static inline functions (or one would have a million warnings to deal with). Just my $0.02.
Yeah, this is much better.
And I think that static variables should not even be in the header files. Doesn't it mean that there's a local copy of the variable everytime the .h file is included? Sure, in this case the overhead is small (4 bytes per include) but still it's wrong. Having a static inline function would solve that problem as well the compiler warning.
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH 08/30] net: wireless: ath: carl9170: Mark 'ar9170_qmap' as __maybe_unused
Quoted 14 lines · Kalle Valo
Quoted 12 lines · Rasmus Villemoes
Quoted 10 lines · Christian Lamparter
Quoted 5 lines · Lee Jones
'
ar9170_qmap' is used in some source files which includecarl9170.h, but not all of them. Mark it as__maybe_unusedto show that this is not only okay, it's expected.Fixes the following W=1 kernel build warning(s)
Is this W=1 really a "must" requirement? I find it strange having
__maybe_unusedin header files as this "suggests" that the definition is redundant.
Quoted 8 lines
Quoted 6 lines
In this case it seems one could replace the table lookup with a
static inline u8
ar9170_qmap(u8 idx){ return 3 - idx; }gcc doesn't warn about unused static inline functions (or one would have a million warnings to deal with). Just my $0.02.
Yeah, this is much better.
Yes, this is much better than just adding __maybe_unused :).
To be on the safe side (and to get rid of a & in tx.c:666), the "3 - idx" should be something like "return (3 - idx) & CARL9170_TX_STATUS_QUEUE". I think its also possible to just use clamp_t
(or min_t since the u8 has no negative values) or make use of a switch statement [analogues what was done in ath10k commit: 91493e8e10 "ath10k: fix recent bandwidth conversion bug" (just to be clear. Yes this ath10k commit has nothing to do with queues, but it is a nice, atomic switch-case static inline function example).]
Quoted 4 lines
And I think that static variables should not even be in the header files. Doesn't it mean that there's a local copy of the variable everytime the .h file is included? Sure, in this case the overhead is small (4 bytes per include) but still it's wrong.
Seems to be "sort of". I compiled both, the current vanilla carl9170 and with Lee Jones' patch on Debian's current gcc 10.2.0 (Debian 10.2.0-5) and gnu ld 2.35.
The ar9170_qmap symbol is only present in the object file if ar9170_qmap is used by the source. In the final module file (carl9170.ko), there are two ar9170_qmap symboles in the module's .rodata section (one is coming from main.o code and the other from tx.o).
(The use of __maybe_unused didn't make any difference. Same overall section and file sizes).
Cheers,
Christian
Re: [PATCH 08/30] net: wireless: ath: carl9170: Mark 'ar9170_qmap' as __maybe_unused
In reply to Kalle ValoQuoted 21 lines · Kalle Valo
Quoted 12 lines · Rasmus Villemoes
Quoted 10 lines · Christian Lamparter
Quoted 5 lines · Lee Jones
'
ar9170_qmap' is used in some source files which includecarl9170.h, but not all of them. Mark it as__maybe_unusedto show that this is not only okay, it's expected.Fixes the following W=1 kernel build warning(s)
Is this W=1 really a "must" requirement? I find it strange having
__maybe_unusedin header files as this "suggests" that the definition is redundant.Quoted 6 lines
In this case it seems one could replace the table lookup with a
static inline u8
ar9170_qmap(u8 idx){ return 3 - idx; }gcc doesn't warn about unused static inline functions (or one would have a million warnings to deal with). Just my $0.02.
Quoted 6 lines
Yeah, this is much better.
And I think that static variables should not even be in the header files. Doesn't it mean that there's a local copy of the variable everytime the .h file is included? Sure, in this case the overhead is small (4 bytes per include) but still it's wrong.
It happens a lot.
As I stated before, the 2 viable options are to a) move it into the source files; ensuring code duplication, unnecessary maintenance burden and probably disparity over time, or b) create (or locate if there is one already) a special header file which is only to be included by the users.
The later option gets really complicated if there are a variety of tables which are included by any given number of source file permutations.
The accepted answer in all of the other subsystems I've worked with so far, is to use __maybe_unused. It's simple, non-intrusive and doesn't rely on any functional changes.
Quoted 2 lines
Having a static inline
function would solve that problem as well the compiler warning.
This time yes, but it's a hack that will only work with simple, linear data. Try doing that with some of the other, more complicated tables, like mwifiex_sdio_sd8*.
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 08/30] net: wireless: ath: carl9170: Mark 'ar9170_qmap' as __maybe_unused
Quoted 46 lines · Lee Jones
Quoted 21 lines · Kalle Valo
Quoted 12 lines · Rasmus Villemoes
Quoted 10 lines · Christian Lamparter
Quoted 5 lines · Lee Jones
'
ar9170_qmap' is used in some source files which includecarl9170.h, but not all of them. Mark it as__maybe_unusedto show that this is not only okay, it's expected.Fixes the following W=1 kernel build warning(s)
Is this W=1 really a "must" requirement? I find it strange having
__maybe_unusedin header files as this "suggests" that the definition is redundant.Quoted 6 lines
In this case it seems one could replace the table lookup with a
static inline u8
ar9170_qmap(u8 idx){ return 3 - idx; }gcc doesn't warn about unused static inline functions (or one would have a million warnings to deal with). Just my $0.02.
Quoted 6 lines
Yeah, this is much better.
And I think that static variables should not even be in the header files. Doesn't it mean that there's a local copy of the variable everytime the .h file is included? Sure, in this case the overhead is small (4 bytes per include) but still it's wrong.
It happens a lot.
As I stated before, the 2 viable options are to a) move it into the source files; ensuring code duplication, unnecessary maintenance burden and probably disparity over time, or b) create (or locate if there is one already) a special header file which is only to be included by the users.
The later option gets really complicated if there are a variety of tables which are included by any given number of source file permutations.
The accepted answer in all of the other subsystems I've worked with so far, is to use
__maybe_unused. It's simple, non-intrusive and doesn't rely on any functional changes.
Quoted 5 lines
Quoted 2 lines
Having a static inline
function would solve that problem as well the compiler warning.This time yes, but it's a hack that will only work with simple, linear data.
To me __maybe_unused is a hack and a static inline function is a much better solution.
Quoted 2 lines
Try doing that with some of the other, more complicated tables, like mwifiex_sdio_sd8*.
Then the table should be moved to a .c file and the .h file should have "extern const int foo[]"
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH v2 8/30 net: wireless: ath: carl9170: Convert 'ar9170_qmap' to inline function
In reply to Lee Jones'ar9170_qmap' is used in some source files which include carl9170.h, but not all of them. A 'defined but not used' warning is thrown when compiling the ones which do not use it.
Fixes the following W=1 kernel build warning(s)
from drivers/net/wireless/ath/carl9170/carl9170.h:57,
In file included from drivers/net/wireless/ath/carl9170/carl9170.h:57, drivers/net/wireless/ath/carl9170/carl9170.h:71:17: warning: ‘ar9170_qmap’ defined but not used [-Wunused-const-variable=]
NB: Snipped - lots of these repeat
--- drivers/net/wireless/ath/carl9170/carl9170.h | 5 ++++- drivers/net/wireless/ath/carl9170/main.c | 2 +- drivers/net/wireless/ath/carl9170/tx.c | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/carl9170/carl9170.h +4 -1
@@ -68,7 +68,10 @@#define PAYLOAD_MAX (CARL9170_MAX_CMD_LEN / 4 - 1) -static const u8 ar9170_qmap[__AR9170_NUM_TXQ] = {3 ,2 ,1 ,0 }; +static inline u8 ar9170_qmap (u8 idx) +{ +return 3 - idx;/* { 3, 2, 1, 0 } */ +}#define CARL9170_MAX_RX_BUFFER_SIZE 8192
drivers/net/wireless/ath/carl9170/main.c +1 -1
@@ -1374,7 +1374,7 @@ static int carl9170_op_conf_tx(struct ieee80211_hw *hw,int ret;mutex_lock (&ar->mutex); -memcpy (&ar->edcf[ar9170_qmap[queue]], param,sizeof (*param)); +memcpy (&ar->edcf[ar9170_qmap (queue)], param,sizeof (*param)); ret =carl9170_set_qos (ar);mutex_unlock (&ar->mutex);return ret;
drivers/net/wireless/ath/carl9170/tx.c +3 -3
@@ -663,7 +663,7 @@ static void __carl9170_tx_process_status(struct ar9170 *ar,unsigned int r, t, q;bool success = true; - q = ar9170_qmap[info &CARL9170_TX_STATUS_QUEUE ]; + q =ar9170_qmap (info &CARL9170_TX_STATUS_QUEUE ); skb =carl9170_get_queued_skb (ar, cookie, &ar->tx_status[q]);if (!skb) {
@@ -979,7 +979,7 @@ static int carl9170_tx_prepare(struct ar9170 *ar, ((CARL9170_TX_SUPER_MISC_VIF_ID >> CARL9170_TX_SUPER_MISC_VIF_ID_S) + 1)); - hw_queue = ar9170_qmap[carl9170_get_queue (ar, skb)]; + hw_queue =ar9170_qmap (carl9170_get_queue (ar, skb)); hdr = (void *)skb->data; info =IEEE80211_SKB_CB (skb);
@@ -1279,7 +1279,7 @@ void carl9170_tx_drop(struct ar9170 *ar, struct sk_buff *skb) super = (void *)skb->data;SET_VAL (CARL9170_TX_SUPER_MISC_QUEUE , q, - ar9170_qmap[carl9170_get_queue (ar, skb)]); +ar9170_qmap (carl9170_get_queue (ar, skb)));__carl9170_tx_process_status (ar, super->s.cookie, q); }
Signature · 1 line
2.25.1
Re: [PATCH v2 08/30] net: wireless: ath: carl9170: Convert 'ar9170_qmap' to inline function
Quoted 21 lines · On Thursday, 27 August 2020 11:33:51 CEST Lee Jones wrote:
'
ar9170_qmap' is used in some source files which includecarl9170.h, but not all of them. A 'defined but not used' warning is thrown when compiling the ones which do not use it.Fixes the following W=1 kernel build warning(s)
from
drivers/net/wireless/ath/carl9170/carl9170.h:57,
In file included fromdrivers/net/wireless/ath/carl9170/carl9170.h:57,drivers/net/wireless/ath/carl9170/carl9170.h:71:17: warning: ‘ar9170_qmap’ defined but not used [-Wunused-const-variable=]NB: Snipped - lots of these repeat
Cc Christian Lamparter <[email protected]>Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Johannes Berg <[email protected]>Suggested-by Rasmus Villemoes <[email protected]>Signed-off-by Lee Jones <[email protected]>
Quoted 1 line
---
For what it's worth:
Re: [PATCH v2 08/30] net: wireless: ath: carl9170: Convert 'ar9170_qmap' to inline function
Quoted 25 lines · Christian Lamparter
Quoted 22 lines · On Thursday, 27 August 2020 11:33:51 CEST Lee Jones wrote:
'
ar9170_qmap' is used in some source files which includecarl9170.h, but not all of them. A 'defined but not used' warning is thrown when compiling the ones which do not use it.Fixes the following W=1 kernel build warning(s)
from
drivers/net/wireless/ath/carl9170/carl9170.h:57,
In file included fromdrivers/net/wireless/ath/carl9170/carl9170.h:57,drivers/net/wireless/ath/carl9170/carl9170.h:71:17: warning:
‘ar9170_qmap’ defined but not used [-Wunused-const-variable=]NB: Snipped - lots of these repeat
Cc Christian Lamparter <[email protected]>Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Johannes Berg <[email protected]>Suggested-by Rasmus Villemoes <[email protected]>Signed-off-by Lee Jones <[email protected]>Quoted 1 line
---
Quoted 2 lines
For what it's worth:
BTW for me Acked-by tags from the maintainer are very useful. Patchwork even collects them automatically and shows the statistics so I can quickly see what patches are ready to be applied. So please do send them if you can :)
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH v2 08/30] net: wireless: ath: carl9170: Convert 'ar9170_qmap' to inline function
In reply to Lee JonesQuoted 12 lines · Lee Jones
'
ar9170_qmap' is used in some source files which includecarl9170.h, but not all of them. A 'defined but not used' warning is thrown when compiling the ones which do not use it.Fixes the following W=1 kernel build warning(s)
from
drivers/net/wireless/ath/carl9170/carl9170.h:57,
In file included fromdrivers/net/wireless/ath/carl9170/carl9170.h:57,drivers/net/wireless/ath/carl9170/carl9170.h:71:17: warning: ‘ar9170_qmap’ defined but not used [-Wunused-const-variable=]NB: Snipped - lots of these repeat
Quoted 11 lines
Cc Christian Lamparter <[email protected]>Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Johannes Berg <[email protected]>Suggested-by Rasmus Villemoes <[email protected]>Signed-off-by Lee Jones <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
859228a3ae82 carl9170: Convert 'ar9170_qmap' to inline function
Signature · 3 lines
https://patchwork.kernel.org/patch/11740469/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH 9/30 net: wireless: ath: ath5k: pcu: Add a description for 'band' remove one for 'mode'
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/net/wireless/ath/ath5k/pcu.c:115: warning: Function parameter or member 'band' not described in 'ath5k_hw_get_frame_duration' drivers/net/wireless/ath/ath5k/pcu.c:955: warning: Excess function parameter 'mode' description in 'ath5k_hw_pcu_init'
--- drivers/net/wireless/ath/ath5k/pcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath5k/pcu.c +1 -1
@@ -101,6 +101,7 @@ static const unsigned int ack_rates_high[] =/** * ath5k_hw_get_frame_duration() - Get tx time of a frame * @ah: The &struct ath5k_hw +* @band: One of enum nl80211_band * @len: Frame's length in bytes * @rate: The @struct ieee80211_rate * @shortpre: Indicate short preample
@@ -945,7 +946,6 @@ ath5k_hw_set_opmode(struct ath5k_hw *ah, enum nl80211_iftype op_mode)* ath5k_hw_pcu_init() - Initialize PCU * @ah: The &struct ath5k_hw * @op_mode: One of enum nl80211_iftype -* @mode: One of enum ath5k_driver_mode * * This function is used to initialize PCU by setting current * operation mode and various other settings.
Signature · 1 line
2.25.1
Re: [PATCH 09/30] net: wireless: ath: ath5k: pcu: Add a description for 'band' remove one for 'mode'
Quoted 5 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/net/wireless/ath/ath5k/pcu.c:115: warning: Function parameter or member 'band' not described in 'ath5k_hw_get_frame_duration'drivers/net/wireless/ath/ath5k/pcu.c:955: warning: Excess function parameter 'mode' description in 'ath5k_hw_pcu_init'
Quoted 14 lines
Cc Jiri Slaby <[email protected]>Cc Nick Kossifidis <[email protected]>Cc Luis Chamberlain <[email protected]>Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Reyk Floeter <[email protected]>Cc "W. S. Bell" <[email protected]>Cc Luis Rodriguez <[email protected]>Cc Pavel Roskin <[email protected]>Signed-off-by Lee Jones <[email protected]>Signed-off-by Kalle Valo <[email protected]>
3 patches applied to ath-next branch of ath.git, thanks.
3a059c76f4eb ath5k: pcu: Add a description for 'band' remove one for 'mode' 691c7a4d4fd7 wil6210: Demote non-kerneldoc headers to standard comment blocks 1d4f5c15cf65 ath5k: Fix kerneldoc formatting issue
Signature · 3 lines
https://patchwork.kernel.org/patch/11714405/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH 10/30 net: wan: dlci: Remove set but not used variable 'err'
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/net/wan/dlci.c: In function ‘dlci_close’:
drivers/net/wan/dlci.c:298:8: warning: variable ‘err’ set but not used [-Wunused-but-set-variable]
--- drivers/net/wan/dlci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wan/dlci.c +1 -2
@@ -295,14 +295,13 @@ static int dlci_close(struct net_device *dev) {struct dlci_local *dlp;struct frad_local *flp; -int err;netif_stop_queue (dev); dlp =netdev_priv (dev); flp =netdev_priv (dlp->slave); - err = (*flp->deactivate)(dlp->slave, dev); + (*flp->deactivate)(dlp->slave, dev);return 0 ; }
Signature · 1 line
2.25.1
PATCH 11/30 net: wireless: cisco: airo: Place brackets around empty statement
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/net/wireless/cisco/airo.c: In function ‘airo_init_module’:
drivers/net/wireless/cisco/airo.c:5663:21: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body]
--- drivers/net/wireless/cisco/airo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/cisco/airo.c +2 -1
@@ -5659,8 +5659,9 @@ static int __init airo_init_module( void )for (i =0 ; i <4 && io[i] && irq[i]; i++) {airo_print_info ("" ,"Trying to configure ISA adapter at irq=%d " "io=0x%x" , irq[i], io[i] ); -if (init_airo_card ( irq[i], io[i],0 ,NULL )) +if (init_airo_card ( irq[i], io[i],0 ,NULL )) {/* do nothing */ ; + } }#ifdef CONFIG_PCI
Signature · 1 line
2.25.1
PATCH 12/30 net: wireless: cisco: airo: Fix a myriad of coding style issues
In reply to Lee Jones - Ensure spaces appear after {for, if, while, etc}
- Ensure spaces to not appear after '('
- Ensure spaces to not appear before ')'
- Ensure spaces appear between ')' and '{'
- Ensure spaces appear after ','
- Ensure spaces do not appear before ','
- Ensure spaces appear either side of '='
- Ensure '{'s which open functions are on a new line
- Remove trailing whitespace
There are still a whole host of issues with this file, but this patch certainly breaks the back of them.
--- drivers/net/wireless/cisco/airo.c | 897 ++++++++++++++++-------------- 1 file changed, 467 insertions(+), 430 deletions(-)
drivers/net/wireless/cisco/airo.c +467 -430
@@ -321,8 +321,8 @@ static int do8bitIO /* = 0 */;#define CMD_DELTLV 0x002b#define CMD_FINDNEXTTLV 0x002c#define CMD_PSPNODES 0x0030 -#define CMD_SETCW 0x0031 -#define CMD_SETPCF 0x0032 +#define CMD_SETCW 0x0031 +#define CMD_SETPCF 0x0032#define CMD_SETPHYREG 0x003e#define CMD_TXTEST 0x003f#define MAC_ENABLETX 0x0101
@@ -433,7 +433,7 @@ static int do8bitIO /* = 0 */;#define STATUS_INTS (EV_AWAKE|EV_LINK|EV_TXEXC|EV_TX|EV_TXCPY|EV_RX|EV_MIC)#ifdef CHECK_UNKNOWN_INTS -#define IGNORE_INTS ( EV_CMD | EV_UNKNOWN) +#define IGNORE_INTS (EV_CMD | EV_UNKNOWN)#else #define IGNORE_INTS (~STATUS_INTS)#endif
@@ -1107,9 +1107,9 @@ static const char version[] = "airo.c 0.6 (Ben Reed & Javier Achirica)";struct airo_info ; -static int get_dec_u16 (char *buffer,int *start,int limit ); -static void OUT4500 (struct airo_info *,u16 reg,u16 value ); -static unsigned short IN4500 (struct airo_info *,u16 reg ); +static int get_dec_u16 (char *buffer,int *start,int limit); +static void OUT4500 (struct airo_info *,u16 reg,u16 value); +static unsigned short IN4500 (struct airo_info *,u16 reg);static u16 setup_card (struct airo_info *,u8 *mac,int lock);static int enable_MAC (struct airo_info *ai,int lock);static void disable_MAC (struct airo_info *ai,int lock);
@@ -1127,24 +1127,24 @@ static int PC4500_accessrid(struct airo_info*, u16 rid, u16 accmd);static int PC4500_readrid (struct airo_info *,u16 rid,void *pBuf,int len,int lock);static int PC4500_writerid (struct airo_info *,u16 rid,const void *pBuf,int len,int lock); -static int do_writerid (struct airo_info *,u16 rid,const void *rid_data, -int len,int dummy ); +static int do_writerid (struct airo_info *,u16 rid,const void *rid_data, +int len,int dummy);static u16 transmit_allocate (struct airo_info *,int lenPayload,int raw);static int transmit_802_3_packet (struct airo_info *,int len,char *pPacket);static int transmit_802_11_packet (struct airo_info *,int len,char *pPacket); -static int mpi_send_packet (struct net_device *dev); +static int mpi_send_packet (struct net_device *dev);static void mpi_unmap_card (struct pci_dev *pci);static void mpi_receive_802_3 (struct airo_info *ai);static void mpi_receive_802_11 (struct airo_info *ai); -static int waitbusy (struct airo_info *ai); +static int waitbusy (struct airo_info *ai); -static irqreturn_t airo_interrupt (int irq,void * dev_id); +static irqreturn_t airo_interrupt (int irq,void * dev_id);static int airo_thread (void *data); -static void timer_func (struct net_device *dev ); +static void timer_func (struct net_device *dev);static int airo_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); -static struct iw_statistics *airo_get_wireless_stats (struct net_device *dev); -static void airo_read_wireless_stats (struct airo_info *local); +static struct iw_statistics *airo_get_wireless_stats (struct net_device *dev); +static void airo_read_wireless_stats (struct airo_info *local);#ifdef CISCO_EXT static int readrids (struct net_device *dev,aironet_ioctl *comp);static int writerids (struct net_device *dev,aironet_ioctl *comp);
@@ -1155,8 +1155,8 @@ static int micsetup(struct airo_info *ai);static int encapsulate (struct airo_info *ai,etherHead *pPacket,MICBuffer *buffer,int len);static int decapsulate (struct airo_info *ai,MICBuffer *mic,etherHead *pPacket,u16 payLen); -static u8 airo_rssi_to_dbm (tdsRssiEntry *rssi_rid,u8 rssi); -static u8 airo_dbm_to_pct (tdsRssiEntry *rssi_rid,u8 dbm); +static u8 airo_rssi_to_dbm (tdsRssiEntry *rssi_rid,u8 rssi); +static u8 airo_dbm_to_pct (tdsRssiEntry *rssi_rid,u8 dbm);static void airo_networks_free (struct airo_info *ai);
@@ -1261,16 +1261,16 @@ static inline int bap_read(struct airo_info *ai, __le16 *pu16Dst, int bytelen,return ai->bap_read (ai, pu16Dst, bytelen, whichbap); } -static int setup_proc_entry (struct net_device *dev, -struct airo_info *apriv ); -static int takedown_proc_entry (struct net_device *dev, -struct airo_info *apriv ); +static int setup_proc_entry (struct net_device *dev, +struct airo_info *apriv); +static int takedown_proc_entry (struct net_device *dev, +struct airo_info *apriv);static int cmdreset (struct airo_info *ai); -static int setflashmode (struct airo_info *ai); -static int flashgchar (struct airo_info *ai,int matchbyte,int dwelltime); +static int setflashmode (struct airo_info *ai); +static int flashgchar (struct airo_info *ai,int matchbyte,int dwelltime);static int flashputbuf (struct airo_info *ai); -static int flashrestart (struct airo_info *ai,struct net_device *dev); +static int flashrestart (struct airo_info *ai,struct net_device *dev); #define airo_print(type, name, fmt, args...) \ printk(type DRV_NAME "(%s): " fmt "\n", name, ##args)
@@ -1294,14 +1294,14 @@ static int flashrestart(struct airo_info *ai,struct net_device *dev);*********************************************************************** */ -static int RxSeqValid (struct airo_info *ai,miccntx *context,int mcast,u32 micSeq); +static int RxSeqValid (struct airo_info *ai,miccntx *context,int mcast,u32 micSeq);static void MoveWindow (miccntx *context,u32 micSeq);static void emmh32_setseed (emmh32_context *context,u8 *pkey,int keylen,struct crypto_sync_skcipher *tfm);static void emmh32_init (emmh32_context *context);static void emmh32_update (emmh32_context *context,u8 *pOctets,int len);static void emmh32_final (emmh32_context *context,u8 digest[4 ]); -static int flashpchar (struct airo_info *ai,int byte,int dwelltime); +static int flashpchar (struct airo_info *ai,int byte,int dwelltime);static void age_mic_context (miccntx *cur,miccntx *old,u8 *key,int key_len,struct crypto_sync_skcipher *tfm)
@@ -1361,7 +1361,8 @@ static void micinit(struct airo_info *ai)/* micsetup - Get ready for business */ -static int micsetup (struct airo_info *ai) { +static int micsetup (struct airo_info *ai) +{int i;if (ai->tfm ==NULL )
@@ -1373,32 +1374,32 @@ static int micsetup(struct airo_info *ai) {return ERROR ; } -for (i=0 ; i <NUM_MODULES ; i++) { -memset (&ai->mod[i].mCtx,0 ,sizeof (miccntx)); -memset (&ai->mod[i].uCtx,0 ,sizeof (miccntx)); +for (i =0 ; i <NUM_MODULES ; i++) { +memset (&ai->mod[i].mCtx,0 ,sizeof (miccntx)); +memset (&ai->mod[i].uCtx,0 ,sizeof (miccntx)); }return SUCCESS ; } -static const u8 micsnap[] = {0xAA ,0xAA ,0x03 ,0x00 ,0x40 ,0x96 ,0x00 ,0x02 }; +static const u8 micsnap[] = {0xAA ,0xAA ,0x03 ,0x00 ,0x40 ,0x96 ,0x00 ,0x02 };/*=========================================================================== * Description: Mic a packet -* +* * Inputs: etherHead * pointer to an 802.3 frame -* +* * Returns: BOOLEAN if successful, otherwise false. * PacketTxLen will be updated with the mic'd packets size. * * Caveats: It is assumed that the frame buffer will already * be big enough to hold the largets mic message possible. * (No memory allocation is done here). -* +* * Author: sbraneky (10/15/01) * Merciless hacks by rwilcher (1/14/02) */ -static int encapsulate (struct airo_info *ai ,etherHead *frame,MICBuffer *mic,int payLen) +static int encapsulate (struct airo_info *ai,etherHead *frame,MICBuffer *mic,int payLen) {miccntx *context;
@@ -1409,7 +1410,7 @@ static int encapsulate(struct airo_info *ai ,etherHead *frame, MICBuffer *mic, i context = &ai->mod[0 ].mCtx; else context = &ai->mod[0 ].uCtx; - +if (!context->valid)return ERROR ;
@@ -1422,10 +1423,10 @@ static int encapsulate(struct airo_info *ai ,etherHead *frame, MICBuffer *mic, i context->tx +=2 ;emmh32_init (&context->seed);// Mic the packet -emmh32_update (&context->seed,frame->da,ETH_ALEN *2 );// DA,SA -emmh32_update (&context->seed,(u8 *)&mic->typelen,10 );// Type/Length and Snap -emmh32_update (&context->seed,(u8 *)&mic->seq,sizeof (mic->seq));//SEQ -emmh32_update (&context->seed,(u8 *)(frame +1 ),payLen);//payload +emmh32_update (&context->seed, frame->da,ETH_ALEN *2 );// DA, SA +emmh32_update (&context->seed, (u8 *)&mic->typelen,10 );// Type/Length and Snap +emmh32_update (&context->seed, (u8 *)&mic->seq,sizeof (mic->seq));//SEQ +emmh32_update (&context->seed, (u8 *)(frame +1 ), payLen);//payload emmh32_final (&context->seed, (u8 *)&mic->mic);/* New Type/length ?????????? */
@@ -1444,11 +1445,11 @@ typedef enum {/*=========================================================================== * Description: Decapsulates a MIC'd packet and returns the 802.3 packet * (removes the MIC stuff) if packet is a valid packet. -* -* Inputs: etherHead pointer to the 802.3 packet -* +* +* Inputs: etherHead pointer to the 802.3 packet +* * Returns: BOOLEAN - TRUE if packet should be dropped otherwise FALSE -* +* * Author: sbraneky (10/15/01) * Merciless hacks by rwilcher (1/14/02) *---------------------------------------------------------------------------
@@ -1488,35 +1489,35 @@ static int decapsulate(struct airo_info *ai, MICBuffer *mic, etherHead *eth, u16//Now do the mic error checking. //Receive seq must be odd -if ( (micSEQ &1 ) ==0 ) { +if ((micSEQ &1 ) ==0 ) { ai->micstats.rxWrongSequence++;return ERROR ; }for (i =0 ; i <NUM_MODULES ; i++) {int mcast = eth->da[0 ] &1 ; -//Determine proper context +//Determine proper context context = mcast ? &ai->mod[i].mCtx : &ai->mod[i].uCtx; - +//Make sure context is valid if (!context->valid) {if (i ==0 ) micError =NOMICPLUMMED ; -continue ; +continue ; } -//DeMic it +//DeMic it if (!mic->typelen) mic->typelen =htons (payLen +sizeof (MICBuffer) -2 ); - +emmh32_init (&context->seed); -emmh32_update (&context->seed, eth->da,ETH_ALEN *2 ); -emmh32_update (&context->seed, (u8 *)&mic->typelen,sizeof (mic->typelen)+sizeof (mic->u.snap)); -emmh32_update (&context->seed, (u8 *)&mic->seq,sizeof (mic->seq)); -emmh32_update (&context->seed, (u8 *)(eth +1 ),payLen); +emmh32_update (&context->seed, eth->da,ETH_ALEN *2 ); +emmh32_update (&context->seed, (u8 *)&mic->typelen,sizeof (mic->typelen)+sizeof (mic->u.snap)); +emmh32_update (&context->seed, (u8 *)&mic->seq,sizeof (mic->seq)); +emmh32_update (&context->seed, (u8 *)(eth +1 ), payLen);//Calculate MIC emmh32_final (&context->seed, digest); - +if (memcmp (digest, &mic->mic,4 )) {//Make sure the mics match //Invalid Mic if (i ==0 )
@@ -1547,22 +1548,22 @@ static int decapsulate(struct airo_info *ai, MICBuffer *mic, etherHead *eth, u16/*=========================================================================== * Description: Checks the Rx Seq number to make sure it is valid * and hasn't already been received -* +* * Inputs: miccntx - mic context to check seq against * micSeq - the Mic seq number -* -* Returns: TRUE if valid otherwise FALSE. +* +* Returns: TRUE if valid otherwise FALSE. * * Author: sbraneky (10/15/01) * Merciless hacks by rwilcher (1/14/02) *--------------------------------------------------------------------------- */ -static int RxSeqValid (struct airo_info *ai,miccntx *context,int mcast,u32 micSeq) +static int RxSeqValid (struct airo_info *ai,miccntx *context,int mcast,u32 micSeq) { -u32 seq,index; +u32 seq, index; -//Allow for the ap being rebooted - if it is then use the next +//Allow for the ap being rebooted - if it is then use the next //sequence number of the current sequence number - might go backwards if (mcast) {
@@ -1583,10 +1584,10 @@ static int RxSeqValid (struct airo_info *ai,miccntx *context,int mcast,u32 micSe//Too old of a SEQ number to check. if ((s32 )seq <0 )return ERROR ; - -if ( seq >64 ) { + +if (seq >64 ) {//Window is infinite forward -MoveWindow (context,micSeq); +MoveWindow (context, micSeq);return SUCCESS ; }
@@ -1599,7 +1600,7 @@ static int RxSeqValid (struct airo_info *ai,miccntx *context,int mcast,u32 micSe//Add seqence number to the list of received numbers. context->rx |= index; -MoveWindow (context,micSeq); +MoveWindow (context, micSeq);return SUCCESS ; }
@@ -1613,7 +1614,7 @@ static void MoveWindow(miccntx *context, u32 micSeq)//Move window if seq greater than the middle of the window if (micSeq > context->window) { shift = (micSeq - context->window) >>1 ; - +//Shift out old if (shift <32 ) context->rx >>= shift;
@@ -1638,7 +1639,7 @@ static void emmh32_setseed(emmh32_context *context, u8 *pkey, int keylen, {/* take the keying material, expand if necessary, truncate at 16-bytes */ /* run through AES counter mode to generate context->coeff[] */ - +SYNC_SKCIPHER_REQUEST_ON_STACK (req, tfm);struct scatterlist sg;u8 iv[AES_BLOCK_SIZE ] = {};
@@ -1669,11 +1670,11 @@ static void emmh32_init(emmh32_context *context)static void emmh32_update (emmh32_context *context,u8 *pOctets,int len) {int coeff_position, byte_position; - +if (len ==0 )return ; - + coeff_position = context->position >>2 ; - +/* deal with partial 32-bit word left over from last update */ byte_position = context->position &3 ;if (byte_position) {
@@ -1712,12 +1713,12 @@ static void emmh32_final(emmh32_context *context, u8 digest[4]) {int coeff_position, byte_position;u32 val; - +u64 sum, utmp;s64 stmp; coeff_position = context->position >>2 ; - +/* deal with partial 32-bit word left over from last update */ byte_position = context->position &3 ;if (byte_position) {
@@ -1750,7 +1751,7 @@ static int readBSSListRid(struct airo_info *ai, int first,if (first ==1 ) {if (ai->flags &FLAG_RADIO_MASK )return -ENETDOWN ;memset (&cmd,0 ,sizeof (cmd)); - cmd.cmd=CMD_LISTBSS ; + cmd.cmd =CMD_LISTBSS ;if (down_interruptible (&ai->sem))return -ERESTARTSYS ; ai->list_bss_task = current;
@@ -1815,7 +1816,7 @@ static inline void checkThrottle(struct airo_info *ai)int i;/* Old hardware had a limit on encryption speed */ if (ai->config.authType !=AUTH_OPEN && maxencrypt) { -for (i=0 ; i<8 ; i++) { +for (i =0 ; i<8 ; i++) {if (ai->config.rates[i] > maxencrypt) { ai->config.rates[i] =0 ; }
@@ -1840,7 +1841,7 @@ static int writeConfigRid(struct airo_info *ai, int lock)else clear_bit (FLAG_ADHOC , &ai->flags); -return PC4500_writerid ( ai,RID_CONFIG , &cfgr,sizeof (cfgr), lock); +return PC4500_writerid (ai,RID_CONFIG , &cfgr,sizeof (cfgr), lock); }static int readStatusRid (struct airo_info *ai,StatusRid *statr,int lock)
@@ -1871,7 +1872,8 @@ static void try_auto_wep(struct airo_info *ai) } } -static int airo_open (struct net_device *dev) { +static int airo_open (struct net_device *dev) +{struct airo_info *ai = dev->ml_priv;int rc =0 ;
@@ -1947,7 +1949,7 @@ static netdev_tx_t mpi_start_xmit(struct sk_buff *skb,spin_lock_irqsave (&ai->aux_lock, flags);skb_queue_tail (&ai->txq, skb); pending =test_bit (FLAG_PENDING_XMIT , &ai->flags); -spin_unlock_irqrestore (&ai->aux_lock,flags); +spin_unlock_irqrestore (&ai->aux_lock, flags);netif_wake_queue (dev);if (pending ==0 ) {
@@ -2096,7 +2098,8 @@ static void get_tx_error(struct airo_info *ai, s32 fid) } } -static void airo_end_xmit (struct net_device *dev) { +static void airo_end_xmit (struct net_device *dev) +{u16 status;int i;struct airo_info *priv = dev->ml_priv;
@@ -2110,7 +2113,7 @@ static void airo_end_xmit(struct net_device *dev) {up (&priv->sem); i =0 ; -if ( status ==SUCCESS ) { +if (status ==SUCCESS ) {netif_trans_update (dev);for (; i <MAX_FIDS /2 && (priv->fids[i] &0xffff0000 ); i++); }else {
@@ -2130,7 +2133,7 @@ static netdev_tx_t airo_start_xmit(struct sk_buff *skb,struct airo_info *priv = dev->ml_priv;u32 *fids = priv->fids; -if ( skb ==NULL ) { +if (skb ==NULL ) {airo_print_err (dev->name,"%s: skb == NULL!" , __func__);return NETDEV_TX_OK ; }
@@ -2140,10 +2143,10 @@ static netdev_tx_t airo_start_xmit(struct sk_buff *skb, }/* Find a vacant FID */ -for ( i =0 ; i <MAX_FIDS /2 && (fids[i] &0xffff0000 ); i++ ); -for ( j = i +1 ; j <MAX_FIDS /2 && (fids[j] &0xffff0000 ); j++ ); +for (i =0 ; i <MAX_FIDS /2 && (fids[i] &0xffff0000 ); i++); +for (j = i +1 ; j <MAX_FIDS /2 && (fids[j] &0xffff0000 ); j++); -if ( j >=MAX_FIDS /2 ) { +if (j >=MAX_FIDS /2 ) {netif_stop_queue (dev);if (i ==MAX_FIDS /2 ) {
@@ -2167,7 +2170,8 @@ static netdev_tx_t airo_start_xmit(struct sk_buff *skb,return NETDEV_TX_OK ; } -static void airo_end_xmit11 (struct net_device *dev) { +static void airo_end_xmit11 (struct net_device *dev) +{u16 status;int i;struct airo_info *priv = dev->ml_priv;
@@ -2181,7 +2185,7 @@ static void airo_end_xmit11(struct net_device *dev) {up (&priv->sem); i =MAX_FIDS /2 ; -if ( status ==SUCCESS ) { +if (status ==SUCCESS ) {netif_trans_update (dev);for (; i <MAX_FIDS && (priv->fids[i] &0xffff0000 ); i++); }else {
@@ -2208,7 +2212,7 @@ static netdev_tx_t airo_start_xmit11(struct sk_buff *skb,return NETDEV_TX_OK ; } -if ( skb ==NULL ) { +if (skb ==NULL ) {airo_print_err (dev->name,"%s: skb == NULL!" , __func__);return NETDEV_TX_OK ; }
@@ -2218,10 +2222,10 @@ static netdev_tx_t airo_start_xmit11(struct sk_buff *skb, }/* Find a vacant FID */ -for ( i =MAX_FIDS /2 ; i <MAX_FIDS && (fids[i] &0xffff0000 ); i++ ); -for ( j = i +1 ; j <MAX_FIDS && (fids[j] &0xffff0000 ); j++ ); +for (i =MAX_FIDS /2 ; i <MAX_FIDS && (fids[i] &0xffff0000 ); i++); +for (j = i +1 ; j <MAX_FIDS && (fids[j] &0xffff0000 ); j++); -if ( j >=MAX_FIDS ) { +if (j >=MAX_FIDS ) {netif_stop_queue (dev);if (i ==MAX_FIDS ) {
@@ -2295,19 +2299,21 @@ static struct net_device_stats *airo_get_stats(struct net_device *dev)return &dev->stats; } -static void airo_set_promisc (struct airo_info *ai) { +static void airo_set_promisc (struct airo_info *ai) +{Cmd cmd;Resp rsp;memset (&cmd,0 ,sizeof (cmd)); - cmd.cmd=CMD_SETMODE ; + cmd.cmd =CMD_SETMODE ;clear_bit (JOB_PROMISC , &ai->jobs); cmd.parm0=(ai->flags&IFF_PROMISC ) ?PROMISC :NOPROMISC ;issuecommand (ai, &cmd, &rsp);up (&ai->sem); } -static void airo_set_multicast_list (struct net_device *dev) { +static void airo_set_multicast_list (struct net_device *dev) +{struct airo_info *ai = dev->ml_priv;if ((dev->flags ^ ai->flags) &IFF_PROMISC ) {
@@ -2357,7 +2363,8 @@ static void del_airo_dev(struct airo_info *ai)list_del (&ai->dev_list); } -static int airo_close (struct net_device *dev) { +static int airo_close (struct net_device *dev) +{struct airo_info *ai = dev->ml_priv;netif_stop_queue (dev);
@@ -2372,7 +2379,7 @@ static int airo_close(struct net_device *dev) {set_bit (FLAG_RADIO_DOWN , &ai->flags);disable_MAC (ai,1 );#endif -disable_interrupts ( ai ); +disable_interrupts (ai);free_irq (dev->irq, dev);
@@ -2382,16 +2389,16 @@ static int airo_close(struct net_device *dev) {return 0 ; } -void stop_airo_card (struct net_device *dev,int freeres ) +void stop_airo_card (struct net_device *dev,int freeres) {struct airo_info *ai = dev->ml_priv;set_bit (FLAG_RADIO_DOWN , &ai->flags);disable_MAC (ai,1 );disable_interrupts (ai); -takedown_proc_entry ( dev, ai ); +takedown_proc_entry (dev, ai);if (test_bit (FLAG_REGISTERED , &ai->flags)) { -unregister_netdev ( dev ); +unregister_netdev (dev);if (ai->wifidev) {unregister_netdev (ai->wifidev);free_netdev (ai->wifidev);
@@ -2415,7 +2422,7 @@ void stop_airo_card( struct net_device *dev, int freeres )kfree (ai->SSID);if (freeres) {/* PCMCIA frees this stuff, so only for PCI and ISA */ -release_region ( dev->base_addr,64 ); +release_region (dev->base_addr,64 );if (test_bit (FLAG_MPI , &ai->flags)) {if (ai->pci)mpi_unmap_card (ai->pci);
@@ -2429,7 +2436,7 @@ void stop_airo_card( struct net_device *dev, int freeres ) }crypto_free_sync_skcipher (ai->tfm);del_airo_dev (ai); -free_netdev ( dev ); +free_netdev (dev); }EXPORT_SYMBOL (stop_airo_card);
@@ -2468,56 +2475,56 @@ static int mpi_init_descriptors (struct airo_info *ai)/* Alloc card RX descriptors */ netif_stop_queue (ai->dev); -memset (&rsp,0 ,sizeof (rsp)); -memset (&cmd,0 ,sizeof (cmd)); +memset (&rsp,0 ,sizeof (rsp)); +memset (&cmd,0 ,sizeof (cmd)); cmd.cmd =CMD_ALLOCATEAUX ; cmd.parm0 =FID_RX ; cmd.parm1 = (ai->rxfids[0 ].card_ram_off - ai->pciaux); cmd.parm2 =MPI_MAX_FIDS ; - rc=issuecommand (ai, &cmd, &rsp); + rc =issuecommand (ai, &cmd, &rsp);if (rc !=SUCCESS ) {airo_print_err (ai->dev->name,"Couldn't allocate RX FID" );return rc; } -for (i=0 ; i<MPI_MAX_FIDS ; i++) { +for (i =0 ; i<MPI_MAX_FIDS ; i++) {memcpy_toio (ai->rxfids[i].card_ram_off, &ai->rxfids[i].rx_desc,sizeof (RxFid)); }/* Alloc card TX descriptors */ -memset (&rsp,0 ,sizeof (rsp)); -memset (&cmd,0 ,sizeof (cmd)); +memset (&rsp,0 ,sizeof (rsp)); +memset (&cmd,0 ,sizeof (cmd)); cmd.cmd =CMD_ALLOCATEAUX ; cmd.parm0 =FID_TX ; cmd.parm1 = (ai->txfids[0 ].card_ram_off - ai->pciaux); cmd.parm2 =MPI_MAX_FIDS ; -for (i=0 ; i<MPI_MAX_FIDS ; i++) { +for (i =0 ; i<MPI_MAX_FIDS ; i++) { ai->txfids[i].tx_desc.valid =1 ;memcpy_toio (ai->txfids[i].card_ram_off, &ai->txfids[i].tx_desc,sizeof (TxFid)); } ai->txfids[i-1 ].tx_desc.eoc =1 ;/* Last descriptor has EOC set */ - rc=issuecommand (ai, &cmd, &rsp); + rc =issuecommand (ai, &cmd, &rsp);if (rc !=SUCCESS ) {airo_print_err (ai->dev->name,"Couldn't allocate TX FID" );return rc; }/* Alloc card Rid descriptor */ -memset (&rsp,0 ,sizeof (rsp)); -memset (&cmd,0 ,sizeof (cmd)); +memset (&rsp,0 ,sizeof (rsp)); +memset (&cmd,0 ,sizeof (cmd)); cmd.cmd =CMD_ALLOCATEAUX ; cmd.parm0 =RID_RW ; cmd.parm1 = (ai->config_desc.card_ram_off - ai->pciaux); cmd.parm2 =1 ;/* Magic number... */ - rc=issuecommand (ai, &cmd, &rsp); + rc =issuecommand (ai, &cmd, &rsp);if (rc !=SUCCESS ) {airo_print_err (ai->dev->name,"Couldn't allocate RID" );return rc;
@@ -2589,7 +2596,7 @@ static int mpi_map_card(struct airo_info *ai, struct pci_dev *pci) vpackoff = ai->shared;/* RX descriptor setup */ -for (i =0 ; i <MPI_MAX_FIDS ; i++) { +for (i =0 ; i <MPI_MAX_FIDS ; i++) { ai->rxfids[i].pending =0 ; ai->rxfids[i].card_ram_off = pciaddroff; ai->rxfids[i].virtual_host_addr = vpackoff;
@@ -2604,7 +2611,7 @@ static int mpi_map_card(struct airo_info *ai, struct pci_dev *pci) }/* TX descriptor setup */ -for (i =0 ; i <MPI_MAX_FIDS ; i++) { +for (i =0 ; i <MPI_MAX_FIDS ; i++) { ai->txfids[i].card_ram_off = pciaddroff; ai->txfids[i].virtual_host_addr = vpackoff; ai->txfids[i].tx_desc.valid =1 ;
@@ -2674,7 +2681,7 @@ static void wifi_setup(struct net_device *dev) dev->min_mtu =68 ; dev->max_mtu =MIC_MSGLEN_MAX ; dev->addr_len =ETH_ALEN ; - dev->tx_queue_len =100 ; + dev->tx_queue_len =100 ;eth_broadcast_addr (dev->broadcast);
@@ -2703,13 +2710,14 @@ static struct net_device *init_wifidev(struct airo_info *ai,return dev; } -static int reset_card (struct net_device *dev ,int lock) { +static int reset_card (struct net_device *dev,int lock) +{struct airo_info *ai = dev->ml_priv;if (lock &&down_interruptible (&ai->sem))return -1 ;waitbusy (ai); -OUT4500 (ai,COMMAND ,CMD_SOFTRESET ); +OUT4500 (ai,COMMAND ,CMD_SOFTRESET );msleep (200 );waitbusy (ai);msleep (200 );
@@ -2774,9 +2782,9 @@ static const struct net_device_ops mpi_netdev_ops = { }; -static struct net_device *_init_airo_card (unsigned short irq,int port, +static struct net_device *_init_airo_card (unsigned short irq,int port,int is_pcmcia,struct pci_dev *pci, -struct device *dmdev ) +struct device *dmdev) {struct net_device *dev;struct airo_info *ai;
@@ -2849,7 +2857,7 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,if (probe) {if (setup_card (ai, dev->dev_addr,1 ) !=SUCCESS ) { -airo_print_err (dev->name,"MAC could not be enabled" ); +airo_print_err (dev->name,"MAC could not be enabled" ); rc = -EIO ; goto err_out_map; }
@@ -2907,8 +2915,8 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,/* Allocate the transmit buffers */ if (probe && !test_bit (FLAG_MPI ,&ai->flags)) -for ( i =0 ; i <MAX_FIDS ; i++ ) - ai->fids[i] =transmit_allocate (ai,AIRO_DEF_MTU ,i>=MAX_FIDS /2 ); +for (i =0 ; i <MAX_FIDS ; i++) + ai->fids[i] =transmit_allocate (ai,AIRO_DEF_MTU , i>=MAX_FIDS /2 );if (setup_proc_entry (dev, dev->ml_priv) <0 ) goto err_out_wifi;
@@ -2929,7 +2937,7 @@ static struct net_device *_init_airo_card( unsigned short irq, int port, } err_out_res:if (!is_pcmcia) -release_region ( dev->base_addr,64 ); +release_region (dev->base_addr,64 ); err_out_nets:airo_networks_free (ai); err_out_free:
@@ -2938,15 +2946,16 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,return NULL ; } -struct net_device *init_airo_card (unsigned short irq,int port,int is_pcmcia, +struct net_device *init_airo_card (unsigned short irq,int port,int is_pcmcia,struct device *dmdev) { -return _init_airo_card ( irq, port, is_pcmcia,NULL , dmdev); +return _init_airo_card (irq, port, is_pcmcia,NULL , dmdev); }EXPORT_SYMBOL (init_airo_card); -static int waitbusy (struct airo_info *ai) { +static int waitbusy (struct airo_info *ai) +{int delay =0 ;while ((IN4500 (ai,COMMAND ) &COMMAND_BUSY ) && (delay <10000 )) {udelay (10 );
@@ -2956,7 +2965,7 @@ static int waitbusy (struct airo_info *ai) {return delay <10000 ; } -int reset_airo_card (struct net_device *dev ) +int reset_airo_card (struct net_device *dev) {int i;struct airo_info *ai = dev->ml_priv;
@@ -2964,24 +2973,25 @@ int reset_airo_card( struct net_device *dev )if (reset_card (dev,1 ))return -1 ; -if (setup_card (ai, dev->dev_addr,1 ) !=SUCCESS ) { +if (setup_card (ai, dev->dev_addr,1 ) !=SUCCESS ) {airo_print_err (dev->name,"MAC could not be enabled" );return -1 ; }airo_print_info (dev->name,"MAC enabled %pM" , dev->dev_addr);/* Allocate the transmit buffers if needed */ if (!test_bit (FLAG_MPI ,&ai->flags)) -for ( i =0 ; i <MAX_FIDS ; i++ ) - ai->fids[i] =transmit_allocate (ai,AIRO_DEF_MTU ,i>=MAX_FIDS /2 ); +for (i =0 ; i <MAX_FIDS ; i++) + ai->fids[i] =transmit_allocate (ai,AIRO_DEF_MTU , i>=MAX_FIDS /2 ); -enable_interrupts ( ai ); +enable_interrupts (ai);netif_wake_queue (dev);return 0 ; }EXPORT_SYMBOL (reset_airo_card); -static void airo_send_event (struct net_device *dev) { +static void airo_send_event (struct net_device *dev) +{struct airo_info *ai = dev->ml_priv;union iwreq_data wrqu;StatusRid status_rid;
@@ -2998,7 +3008,8 @@ static void airo_send_event(struct net_device *dev) {wireless_send_event (dev,SIOCGIWAP , &wrqu,NULL ); } -static void airo_process_scan_results (struct airo_info *ai) { +static void airo_process_scan_results (struct airo_info *ai) +{union iwreq_data wrqu;BSSListRid bss;int rc;
@@ -3014,14 +3025,14 @@ static void airo_process_scan_results (struct airo_info *ai) {/* Try to read the first entry of the scan result */ rc =PC4500_readrid (ai, ai->bssListFirst, &bss, ai->bssListRidLen,0 ); -if ((rc) || (bss.index ==cpu_to_le16 (0xffff ))) { +if ((rc) || (bss.index ==cpu_to_le16 (0xffff ))) {/* No scan results */ goto out; }/* Read and parse all entries */ tmp_net =NULL ; -while ((!rc) && (bss.index !=cpu_to_le16 (0xffff ))) { +while ((!rc) && (bss.index !=cpu_to_le16 (0xffff ))) {/* Grab a network off the free list */ if (!list_empty (&ai->network_free_list)) { tmp_net = list_entry(ai->network_free_list.next,
@@ -3062,13 +3073,14 @@ static void airo_process_scan_results (struct airo_info *ai) {wireless_send_event (ai->dev,SIOCGIWSCAN , &wrqu,NULL ); } -static int airo_thread (void *data) { +static int airo_thread (void *data) +{struct net_device *dev = data;struct airo_info *ai = dev->ml_priv;int locked;set_freezable (); -while (1 ) { +while (1 ) {/* make swsusp happy with our thread */ try_to_freeze ();
@@ -3088,11 +3100,11 @@ static int airo_thread(void *data) {break ;if (ai->expires || ai->scan_timeout) {if (ai->scan_timeout && -time_after_eq (jiffies,ai->scan_timeout)){ +time_after_eq (jiffies, ai->scan_timeout)) {set_bit (JOB_SCAN_RESULTS , &ai->jobs);break ; }else if (ai->expires && -time_after_eq (jiffies,ai->expires)){ +time_after_eq (jiffies, ai->expires)) {set_bit (JOB_AUTOWEP , &ai->jobs);break ; }
@@ -3442,11 +3454,11 @@ static void airo_handle_tx(struct airo_info *ai, u16 status)spin_lock_irqsave (&ai->aux_lock, flags);if (!skb_queue_empty (&ai->txq)) { -spin_unlock_irqrestore (&ai->aux_lock,flags); +spin_unlock_irqrestore (&ai->aux_lock, flags);mpi_send_packet (ai->dev); }else {clear_bit (FLAG_PENDING_XMIT , &ai->flags); -spin_unlock_irqrestore (&ai->aux_lock,flags); +spin_unlock_irqrestore (&ai->aux_lock, flags);netif_wake_queue (ai->dev); }OUT4500 (ai,EVACK , status & (EV_TX |EV_TXCPY |EV_TXEXC ));
@@ -3526,9 +3538,9 @@ static irqreturn_t airo_interrupt(int irq, void *dev_id)if (status & (EV_TX |EV_TXCPY |EV_TXEXC ))airo_handle_tx (ai, status); -if ( status & ~STATUS_INTS & ~IGNORE_INTS ) { +if (status & ~STATUS_INTS & ~IGNORE_INTS ) {airo_print_warn (ai->dev->name,"Got weird status %x" , - status & ~STATUS_INTS & ~IGNORE_INTS ); + status & ~STATUS_INTS & ~IGNORE_INTS ); } }
@@ -3547,27 +3559,29 @@ static irqreturn_t airo_interrupt(int irq, void *dev_id)* NOTE: If use with 8bit mode and SMP bad things will happen! * Why would some one do 8 bit IO in an SMP machine?!? */ -static void OUT4500 (struct airo_info *ai,u16 reg,u16 val ) { +static void OUT4500 (struct airo_info *ai,u16 reg,u16 val) +{if (test_bit (FLAG_MPI ,&ai->flags)) reg <<=1 ; -if ( !do8bitIO ) -outw ( val, ai->dev->base_addr + reg ); +if (!do8bitIO) +outw (val, ai->dev->base_addr + reg);else { -outb ( val &0xff , ai->dev->base_addr + reg ); -outb ( val >>8 , ai->dev->base_addr + reg +1 ); +outb (val &0xff , ai->dev->base_addr + reg); +outb (val >>8 , ai->dev->base_addr + reg +1 ); } } -static u16 IN4500 (struct airo_info *ai,u16 reg ) { +static u16 IN4500 (struct airo_info *ai,u16 reg) +{unsigned short rc;if (test_bit (FLAG_MPI ,&ai->flags)) reg <<=1 ; -if ( !do8bitIO ) - rc =inw ( ai->dev->base_addr + reg ); +if (!do8bitIO) + rc =inw (ai->dev->base_addr + reg);else { - rc =inb ( ai->dev->base_addr + reg ); - rc += ((int )inb ( ai->dev->base_addr + reg +1 )) <<8 ; + rc =inb (ai->dev->base_addr + reg); + rc += ((int )inb (ai->dev->base_addr + reg +1 )) <<8 ; }return rc; }
@@ -3611,7 +3625,8 @@ static int enable_MAC(struct airo_info *ai, int lock)return rc; } -static void disable_MAC (struct airo_info *ai,int lock ) { +static void disable_MAC (struct airo_info *ai,int lock) +{Cmd cmd;Resp rsp;
@@ -3630,13 +3645,15 @@ static void disable_MAC( struct airo_info *ai, int lock ) {up (&ai->sem); } -static void enable_interrupts (struct airo_info *ai ) { +static void enable_interrupts (struct airo_info *ai) +{/* Enable the interrupts */ -OUT4500 ( ai,EVINTEN ,STATUS_INTS ); +OUT4500 (ai,EVINTEN ,STATUS_INTS ); } -static void disable_interrupts (struct airo_info *ai ) { -OUT4500 ( ai,EVINTEN ,0 ); +static void disable_interrupts (struct airo_info *ai) +{ +OUT4500 (ai,EVINTEN ,0 ); }static void mpi_receive_802_3 (struct airo_info *ai)
@@ -3660,7 +3677,7 @@ static void mpi_receive_802_3(struct airo_info *ai) ai->dev->stats.rx_dropped++; goto badrx; } - buffer =skb_put (skb,len); + buffer =skb_put (skb, len);memcpy (buffer, ai->rxfids[0 ].virtual_host_addr,ETH_ALEN *2 );if (ai->micstats.enabled) { memcpy(&micbuf,
@@ -3739,8 +3756,8 @@ static void mpi_receive_802_11(struct airo_info *ai) fc =get_unaligned ((__le16 *)ptr); hdrlen =header_len (fc); - skb =dev_alloc_skb ( len + hdrlen +2 ); -if ( !skb ) { + skb =dev_alloc_skb (len + hdrlen +2 ); +if (!skb) { ai->dev->stats.rx_dropped++; goto badrx; }
@@ -3784,7 +3801,7 @@ static void mpi_receive_802_11(struct airo_info *ai) skb->dev = ai->wifidev; skb->protocol =htons (ETH_P_802_2 ); skb->ip_summed =CHECKSUM_NONE ; -netif_rx ( skb ); +netif_rx (skb); badrx:if (rxd.valid ==0 ) {
@@ -3815,7 +3832,7 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock)WepKeyRid wkr;int rc; -memset ( &mySsid,0 ,sizeof ( mySsid ) ); +memset (&mySsid,0 ,sizeof (mySsid));kfree (ai->flash); ai->flash =NULL ;
@@ -3824,12 +3841,12 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock) cmd.parm0 = cmd.parm1 = cmd.parm2 =0 ;if (lock &&down_interruptible (&ai->sem))return ERROR ; -if (issuecommand ( ai, &cmd, &rsp ) !=SUCCESS ) { +if (issuecommand (ai, &cmd, &rsp) !=SUCCESS ) {if (lock)up (&ai->sem);return ERROR ; } -disable_MAC ( ai,0 ); +disable_MAC (ai,0 );// Let's figure out if we need to use the AUX port if (!test_bit (FLAG_MPI ,&ai->flags)) {
@@ -3859,13 +3876,13 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock) ai->SSID =NULL ;// general configuration (read/modify/write) status =readConfigRid (ai, lock); -if ( status !=SUCCESS )return ERROR ; +if (status !=SUCCESS )return ERROR ; status =readCapabilityRid (ai, &cap_rid, lock); -if ( status !=SUCCESS )return ERROR ; +if (status !=SUCCESS )return ERROR ; - status =PC4500_readrid (ai,RID_RSSI ,&rssi_rid,sizeof (rssi_rid),lock); -if ( status ==SUCCESS ) { + status =PC4500_readrid (ai,RID_RSSI ,&rssi_rid,sizeof (rssi_rid), lock); +if (status ==SUCCESS ) {if (ai->rssi || (ai->rssi =kmalloc (512 ,GFP_KERNEL )) !=NULL )memcpy (ai->rssi, (u8 *)&rssi_rid +2 ,512 );/* Skip RID length member */ }
@@ -3890,15 +3907,15 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock) }/* Save off the MAC */ -for ( i =0 ; i <ETH_ALEN ; i++ ) { +for (i =0 ; i <ETH_ALEN ; i++) { mac[i] = ai->config.macAddr[i]; }/* Check to see if there are any insmod configured rates to add */ -if ( rates[0 ] ) { -memset (ai->config.rates,0 ,sizeof (ai->config.rates)); -for ( i =0 ; i <8 && rates[i]; i++ ) { +if (rates[0 ]) { +memset (ai->config.rates,0 ,sizeof (ai->config.rates)); +for (i =0 ; i <8 && rates[i]; i++) { ai->config.rates[i] = rates[i]; } }
@@ -3906,9 +3923,9 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock) }/* Setup the SSIDs if present */ -if ( ssids[0 ] ) { +if (ssids[0 ]) {int i; -for ( i =0 ; i <3 && ssids[i]; i++ ) { +for (i =0 ; i <3 && ssids[i]; i++) {size_t len =strlen (ssids[i]);if (len >32 ) len =32 ;
@@ -3919,12 +3936,12 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock) } status =writeConfigRid (ai, lock); -if ( status !=SUCCESS )return ERROR ; +if (status !=SUCCESS )return ERROR ;/* Set up the SSID list */ -if ( ssids[0 ] ) { +if (ssids[0 ]) { status =writeSsidRid (ai, &mySsid, lock); -if ( status !=SUCCESS )return ERROR ; +if (status !=SUCCESS )return ERROR ; } status =enable_MAC (ai, lock);
@@ -3939,14 +3956,15 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock) ai->defindex = wkr.mac[0 ]; } rc =readWepKeyRid (ai, &wkr,0 , lock); - }while (lastindex != wkr.kindex); + }while (lastindex != wkr.kindex);try_auto_wep (ai);return SUCCESS ; } -static u16 issuecommand (struct airo_info *ai,Cmd *pCmd,Resp *pRsp) { +static u16 issuecommand (struct airo_info *ai,Cmd *pCmd,Resp *pRsp) +{// Im really paranoid about letting it run forever! int max_tries =600000 ;
@@ -3966,7 +3984,7 @@ static u16 issuecommand(struct airo_info *ai, Cmd *pCmd, Resp *pRsp) {schedule (); } -if ( max_tries ==-1 ) { +if (max_tries ==-1 ) {airo_print_err (ai->dev->name,"Max tries exceeded when issuing command" );if (IN4500 (ai,COMMAND ) &COMMAND_BUSY )
@@ -3998,7 +4016,7 @@ static u16 issuecommand(struct airo_info *ai, Cmd *pCmd, Resp *pRsp) {/* Sets up the bap to start exchange data. whichbap should * be one of the BAP0 or BAP1 defines. Locks should be held before * calling! */ -static int bap_setup (struct airo_info *ai,u16 rid,u16 offset,int whichbap ) +static int bap_setup (struct airo_info *ai,u16 rid,u16 offset,int whichbap) {int timeout =50 ;int max_tries =3 ;
@@ -4013,15 +4031,15 @@ static int bap_setup(struct airo_info *ai, u16 rid, u16 offset, int whichbap )if (timeout--) {continue ; } - }else if ( status &BAP_ERR ) { + }else if (status &BAP_ERR ) {/* invalid rid or offset */ airo_print_err (ai->dev->name,"BAP error %x %d" , - status, whichbap ); + status, whichbap);return ERROR ; }else if (status &BAP_DONE ) {// success return SUCCESS ; } -if ( !(max_tries--) ) { +if (!(max_tries--)) {airo_print_err (ai->dev->name,"BAP setup error too many retries\n" );return ERROR ;
@@ -4067,15 +4085,15 @@ static int aux_bap_read(struct airo_info *ai, __le16 *pu16Dst, next =aux_setup (ai, page, offset, &len); words = (bytelen+1 )>>1 ; -for (i=0 ; i<words;) { +for (i =0 ; i<words;) {int count; count = (len>>1 ) < (words-i) ? (len>>1 ) : (words-i); -if ( !do8bitIO ) -insw ( ai->dev->base_addr+DATA0 +whichbap, - pu16Dst+i,count ); +if (!do8bitIO) +insw (ai->dev->base_addr+DATA0 +whichbap, + pu16Dst+i, count);else -insb ( ai->dev->base_addr+DATA0 +whichbap, - pu16Dst+i, count <<1 ); +insb (ai->dev->base_addr+DATA0 +whichbap, + pu16Dst+i, count <<1 ); i += count;if (i<words) { next =aux_setup (ai, next,4 , &len);
@@ -4091,10 +4109,10 @@ static int fast_bap_read(struct airo_info *ai, __le16 *pu16Dst, int bytelen, int whichbap) { bytelen = (bytelen +1 ) & (~1 );// round up to even value -if ( !do8bitIO ) -insw ( ai->dev->base_addr+DATA0 +whichbap, pu16Dst, bytelen>>1 ); +if (!do8bitIO) +insw (ai->dev->base_addr+DATA0 +whichbap, pu16Dst, bytelen>>1 );else -insb ( ai->dev->base_addr+DATA0 +whichbap, pu16Dst, bytelen ); +insb (ai->dev->base_addr+DATA0 +whichbap, pu16Dst, bytelen);return SUCCESS ; }
@@ -4103,11 +4121,11 @@ static int bap_write(struct airo_info *ai, const __le16 *pu16Src, int bytelen, int whichbap) { bytelen = (bytelen +1 ) & (~1 );// round up to even value -if ( !do8bitIO ) -outsw ( ai->dev->base_addr+DATA0 +whichbap, - pu16Src, bytelen>>1 ); +if (!do8bitIO) +outsw (ai->dev->base_addr+DATA0 +whichbap, + pu16Src, bytelen>>1 );else -outsb ( ai->dev->base_addr+DATA0 +whichbap, pu16Src, bytelen ); +outsb (ai->dev->base_addr+DATA0 +whichbap, pu16Src, bytelen);return SUCCESS ; }
@@ -4122,7 +4140,7 @@ static int PC4500_accessrid(struct airo_info *ai, u16 rid, u16 accmd) cmd.parm0 = rid; status =issuecommand (ai, &cmd, &rsp);if (status !=0 )return status; -if ( (rsp.status &0x7F00 ) !=0 ) { +if ((rsp.status &0x7F00 ) !=0 ) {return (accmd <<8 ) + (rsp.rsp0 &0xFF ); }return 0 ;
@@ -4177,10 +4195,10 @@ static int PC4500_readrid(struct airo_info *ai, u16 rid, void *pBuf, int len, in// length for remaining part of rid len =min (len, (int )le16_to_cpu (*(__le16 *)pBuf)) -2 ; -if ( len <=2 ) { +if (len <=2 ) {airo_print_err (ai->dev->name,"Rid %x has a length of %d which is too short" , - (int )rid, (int )len ); + (int )rid, (int )len); rc =ERROR ; goto done; }
@@ -4248,7 +4266,7 @@ static int PC4500_writerid(struct airo_info *ai, u16 rid, } }else {// --- first access so that we can write the rid data -if ( (status =PC4500_accessrid (ai, rid,CMD_ACCESS )) !=0 ) { +if ((status =PC4500_accessrid (ai, rid,CMD_ACCESS )) !=0 ) { rc = status; goto done; }
@@ -4285,7 +4303,7 @@ static u16 transmit_allocate(struct airo_info *ai, int lenPayload, int raw) txFid =ERROR ; goto done; } -if ( (rsp.status &0xFF00 ) !=0 ) { +if ((rsp.status &0xFF00 ) !=0 ) { txFid =ERROR ; goto done; }
@@ -4344,9 +4362,9 @@ static int transmit_802_3_packet(struct airo_info *ai, int len, char *pPacket) } len -=ETH_ALEN *2 ; -if (test_bit (FLAG_MIC_CAPABLE , &ai->flags) && ai->micstats.enabled && +if (test_bit (FLAG_MIC_CAPABLE , &ai->flags) && ai->micstats.enabled && (ntohs (((__be16 *)pPacket)[6 ]) !=0x888E )) { -if (encapsulate (ai,(etherHead *)pPacket,&pMic,len) !=SUCCESS ) +if (encapsulate (ai, (etherHead *)pPacket,&pMic, len) !=SUCCESS )return ERROR ; miclen =sizeof (pMic); }
@@ -4356,17 +4374,17 @@ static int transmit_802_3_packet(struct airo_info *ai, int len, char *pPacket)/* The hardware addresses aren't counted as part of the payload, so * we have to subtract the 12 bytes for the addresses off */ payloadLen =cpu_to_le16 (len + miclen); -bap_write (ai, &payloadLen,sizeof (payloadLen),BAP1 ); +bap_write (ai, &payloadLen,sizeof (payloadLen),BAP1 );bap_write (ai, (__le16 *)pPacket,sizeof (etherHead),BAP1 );if (miclen)bap_write (ai, (__le16 *)&pMic, miclen,BAP1 );bap_write (ai, (__le16 *)(pPacket +sizeof (etherHead)), len,BAP1 );// issue the transmit command -memset ( &cmd,0 ,sizeof ( cmd ) ); +memset (&cmd,0 ,sizeof (cmd)); cmd.cmd =CMD_TRANSMIT ; cmd.parm0 = txFid;if (issuecommand (ai, &cmd, &rsp) !=SUCCESS )return ERROR ; -if ( (rsp.status &0xFF00 ) !=0 )return ERROR ; +if ((rsp.status &0xFF00 ) !=0 )return ERROR ;return SUCCESS ; }
@@ -4395,18 +4413,18 @@ static int transmit_802_11_packet(struct airo_info *ai, int len, char *pPacket)/* The 802.11 header aren't counted as part of the payload, so * we have to subtract the header bytes off */ payloadLen =cpu_to_le16 (len-hdrlen); -bap_write (ai, &payloadLen,sizeof (payloadLen),BAP1 ); +bap_write (ai, &payloadLen,sizeof (payloadLen),BAP1 );if (bap_setup (ai, txFid,0x0014 ,BAP1 ) !=SUCCESS )return ERROR ;bap_write (ai, (__le16 *)pPacket, hdrlen,BAP1 );bap_write (ai, (__le16 *)(tail + (hdrlen -10 )),38 - hdrlen,BAP1 );bap_write (ai, (__le16 *)(pPacket + hdrlen), len - hdrlen,BAP1 );// issue the transmit command -memset ( &cmd,0 ,sizeof ( cmd ) ); +memset (&cmd,0 ,sizeof (cmd)); cmd.cmd =CMD_TRANSMIT ; cmd.parm0 = txFid;if (issuecommand (ai, &cmd, &rsp) !=SUCCESS )return ERROR ; -if ( (rsp.status &0xFF00 ) !=0 )return ERROR ; +if ((rsp.status &0xFF00 ) !=0 )return ERROR ;return SUCCESS ; }
@@ -4415,25 +4433,25 @@ static int transmit_802_11_packet(struct airo_info *ai, int len, char *pPacket)* like! Feel free to clean it up! */ -static ssize_t proc_read (struct file *file, +static ssize_t proc_read (struct file *file,char __user *buffer,size_t len,loff_t *offset); -static ssize_t proc_write (struct file *file, +static ssize_t proc_write (struct file *file,const char __user *buffer,size_t len, -loff_t *offset ); -static int proc_close (struct inode *inode,struct file *file ); - -static int proc_stats_open (struct inode *inode,struct file *file ); -static int proc_statsdelta_open (struct inode *inode,struct file *file ); -static int proc_status_open (struct inode *inode,struct file *file ); -static int proc_SSID_open (struct inode *inode,struct file *file ); -static int proc_APList_open (struct inode *inode,struct file *file ); -static int proc_BSSList_open (struct inode *inode,struct file *file ); -static int proc_config_open (struct inode *inode,struct file *file ); -static int proc_wepkey_open (struct inode *inode,struct file *file ); +loff_t *offset); +static int proc_close (struct inode *inode,struct file *file); + +static int proc_stats_open (struct inode *inode,struct file *file); +static int proc_statsdelta_open (struct inode *inode,struct file *file); +static int proc_status_open (struct inode *inode,struct file *file); +static int proc_SSID_open (struct inode *inode,struct file *file); +static int proc_APList_open (struct inode *inode,struct file *file); +static int proc_BSSList_open (struct inode *inode,struct file *file); +static int proc_config_open (struct inode *inode,struct file *file); +static int proc_wepkey_open (struct inode *inode,struct file *file);static const struct proc_ops proc_statsdelta_ops = { .proc_read = proc_read,
@@ -4508,12 +4526,13 @@ struct proc_data {void (*on_close) (struct inode *,struct file *); }; -static int setup_proc_entry (struct net_device *dev, -struct airo_info *apriv ) { +static int setup_proc_entry (struct net_device *dev, +struct airo_info *apriv) +{struct proc_dir_entry *entry;/* First setup the device directory */ -strcpy (apriv->proc_name,dev->name); +strcpy (apriv->proc_name, dev->name); apriv->proc_entry =proc_mkdir_mode (apriv->proc_name, airo_perm, airo_entry);if (!apriv->proc_entry)
@@ -4582,8 +4601,8 @@ static int setup_proc_entry( struct net_device *dev,return -ENOMEM ; } -static int takedown_proc_entry (struct net_device *dev, -struct airo_info *apriv ) +static int takedown_proc_entry (struct net_device *dev, +struct airo_info *apriv) {remove_proc_subtree (apriv->proc_name, airo_entry);return 0 ;
@@ -4601,10 +4620,10 @@ static int takedown_proc_entry( struct net_device *dev,* The read routine is generic, it relies on the preallocated rbuffer * to supply the data. */ -static ssize_t proc_read (struct file *file, +static ssize_t proc_read (struct file *file,char __user *buffer,size_t len, -loff_t *offset ) +loff_t *offset) {struct proc_data *priv = file->private_data;
@@ -4619,10 +4638,10 @@ static ssize_t proc_read( struct file *file,* The write routine is generic, it fills in a preallocated rbuffer * to supply the data. */ -static ssize_t proc_write (struct file *file, +static ssize_t proc_write (struct file *file,const char __user *buffer,size_t len, -loff_t *offset ) +loff_t *offset) {ssize_t ret;struct proc_data *priv = file->private_data;
@@ -4648,10 +4667,10 @@ static int proc_status_open(struct inode *inode, struct file *file)u16 mode;int i; -if ((file->private_data =kzalloc (sizeof (struct proc_data ),GFP_KERNEL )) ==NULL ) +if ((file->private_data =kzalloc (sizeof (struct proc_data ),GFP_KERNEL )) ==NULL )return -ENOMEM ; data = file->private_data; -if ((data->rbuffer =kmalloc (2048 ,GFP_KERNEL )) ==NULL ) { +if ((data->rbuffer =kmalloc (2048 ,GFP_KERNEL )) ==NULL ) {kfree (file->private_data);return -ENOMEM ; }
@@ -4671,7 +4690,7 @@ static int proc_status_open(struct inode *inode, struct file *file) mode &0x100 ?"KEY " :"" , mode &0x200 ?"WEP " :"" , mode & 0x8000 ? "ERR ": ""); -sprintf ( data->rbuffer+i,"Mode: %x\n" +sprintf (data->rbuffer+i,"Mode: %x\n" "Signal Strength: %d\n" "Signal Quality: %d\n" "SSID: %-.*s\n"
@@ -4701,26 +4720,28 @@ static int proc_status_open(struct inode *inode, struct file *file)le16_to_cpu (cap_rid.softVer),le16_to_cpu (cap_rid.softSubVer), le16_to_cpu(cap_rid.bootBlockVer)); - data->readlen =strlen ( data->rbuffer ); + data->readlen =strlen (data->rbuffer);return 0 ; }static int proc_stats_rid_open (struct inode *,struct file *,u16 ); -static int proc_statsdelta_open (struct inode *inode, -struct file *file ) { +static int proc_statsdelta_open (struct inode *inode, +struct file *file) +{if (file->f_mode&FMODE_WRITE ) {return proc_stats_rid_open (inode, file,RID_STATSDELTACLEAR ); }return proc_stats_rid_open (inode, file,RID_STATSDELTA ); } -static int proc_stats_open (struct inode *inode,struct file *file ) { +static int proc_stats_open (struct inode *inode,struct file *file) +{return proc_stats_rid_open (inode, file,RID_STATS ); } -static int proc_stats_rid_open (struct inode *inode, +static int proc_stats_rid_open (struct inode *inode,struct file *file, -u16 rid ) +u16 rid) {struct proc_data *data;struct net_device *dev =PDE_DATA (inode);
@@ -4730,10 +4751,10 @@ static int proc_stats_rid_open( struct inode *inode,__le32 *vals = stats.vals;int len; -if ((file->private_data =kzalloc (sizeof (struct proc_data ),GFP_KERNEL )) ==NULL ) +if ((file->private_data =kzalloc (sizeof (struct proc_data ),GFP_KERNEL )) ==NULL )return -ENOMEM ; data = file->private_data; -if ((data->rbuffer =kmalloc (4096 ,GFP_KERNEL )) ==NULL ) { +if ((data->rbuffer =kmalloc (4096 ,GFP_KERNEL )) ==NULL ) {kfree (file->private_data);return -ENOMEM ; }
@@ -4742,7 +4763,7 @@ static int proc_stats_rid_open( struct inode *inode, len =le16_to_cpu (stats.len); j =0 ; -for (i=0 ; statsLabels[i]!=(char *)-1 && i*4 <len; i++) { +for (i =0 ; statsLabels[i]!=(char *)-1 && i*4 <len; i++) {if (!statsLabels[i])continue ;if (j+strlen (statsLabels[i])+16 >4096 ) { airo_print_warn(apriv->dev->name,
@@ -4759,7 +4780,8 @@ static int proc_stats_rid_open( struct inode *inode,return 0 ; } -static int get_dec_u16 (char *buffer,int *start,int limit ) { +static int get_dec_u16 (char *buffer,int *start,int limit) +{u16 value;int valid =0 ; for (value = 0; *start < limit && buffer[*start] >= '0' &&
@@ -4768,7 +4790,7 @@ static int get_dec_u16( char *buffer, int *start, int limit ) { value *=10 ; value += buffer[*start] -'0' ; } -if ( !valid )return -1 ; +if (!valid)return -1 ;return value; }
@@ -4789,15 +4811,15 @@ static void proc_config_on_close(struct inode *inode, struct file *file)struct airo_info *ai = dev->ml_priv;char *line; -if ( !data->writelen )return ; +if (!data->writelen)return ;readConfigRid (ai,1 );set_bit (FLAG_COMMIT , &ai->flags); line = data->wbuffer; -while ( line[0 ] ) { +while (line[0 ]) {/*** Mode processing */ -if ( !strncmp ( line,"Mode: " ,6 ) ) { +if (!strncmp (line,"Mode: " ,6 )) { line +=6 ;if (sniffing_mode (ai))set_bit (FLAG_RESET , &ai->flags);
@@ -4805,19 +4827,19 @@ static void proc_config_on_close(struct inode *inode, struct file *file)clear_bit (FLAG_802_11 , &ai->flags); ai->config.opmode &= ~MODE_CFG_MASK ; ai->config.scanMode =SCANMODE_ACTIVE ; -if ( line[0 ] =='a' ) { +if (line[0 ] =='a' ) { ai->config.opmode |=MODE_STA_IBSS ; }else { ai->config.opmode |=MODE_STA_ESS ; -if ( line[0 ] =='r' ) { +if (line[0 ] =='r' ) { ai->config.rmode |=RXMODE_RFMON |RXMODE_DISABLE_802_3_HEADER ; ai->config.scanMode =SCANMODE_PASSIVE ;set_bit (FLAG_802_11 , &ai->flags); - }else if ( line[0 ] =='y' ) { + }else if (line[0 ] =='y' ) { ai->config.rmode |=RXMODE_RFMON_ANYBSS |RXMODE_DISABLE_802_3_HEADER ; ai->config.scanMode =SCANMODE_PASSIVE ;set_bit (FLAG_802_11 , &ai->flags); - }else if ( line[0 ] =='l' ) + }else if (line[0 ] =='l' ) ai->config.rmode |=RXMODE_LANMON ; }set_bit (FLAG_COMMIT , &ai->flags);
@@ -4826,68 +4848,68 @@ static void proc_config_on_close(struct inode *inode, struct file *file)/*** Radio status */ else if (!strncmp(line,"Radio: ", 7)) { line +=7 ; -if (!strncmp (line,"off" ,3 )) { +if (!strncmp (line,"off" ,3 )) {set_bit (FLAG_RADIO_OFF , &ai->flags); }else {clear_bit (FLAG_RADIO_OFF , &ai->flags); } }/*** NodeName processing */ - else if ( !strncmp( line, "NodeName: ", 10 ) ) { + else if (!strncmp(line, "NodeName: ", 10)) {int j; line +=10 ; -memset ( ai->config.nodeName,0 ,16 ); +memset (ai->config.nodeName,0 ,16 );/* Do the name, assume a space between the mode and node name */ -for ( j =0 ; j <16 && line[j] !='\n' ; j++ ) { +for (j =0 ; j <16 && line[j] !='\n' ; j++) { ai->config.nodeName[j] = line[j]; }set_bit (FLAG_COMMIT , &ai->flags); }/*** PowerMode processing */ - else if ( !strncmp( line, "PowerMode: ", 11 ) ) { + else if (!strncmp(line, "PowerMode: ", 11)) { line +=11 ; -if ( !strncmp ( line,"PSPCAM" ,6 ) ) { +if (!strncmp (line,"PSPCAM" ,6 )) { ai->config.powerSaveMode =POWERSAVE_PSPCAM ;set_bit (FLAG_COMMIT , &ai->flags); - }else if ( !strncmp ( line,"PSP" ,3 ) ) { + }else if (!strncmp (line,"PSP" ,3 )) { ai->config.powerSaveMode =POWERSAVE_PSP ;set_bit (FLAG_COMMIT , &ai->flags); }else { ai->config.powerSaveMode =POWERSAVE_CAM ;set_bit (FLAG_COMMIT , &ai->flags); } - } else if ( !strncmp( line, "DataRates: ", 11 ) ) { + } else if (!strncmp(line, "DataRates: ", 11)) {int v, i =0 , k =0 ;/* i is index into line, k is index to rates */ line +=11 ; -while ((v =get_dec_u16 (line, &i,3 ))!=-1 ) { +while ((v =get_dec_u16 (line, &i,3 ))!=-1 ) { ai->config.rates[k++] = (u8 )v; line += i +1 ; i =0 ; }set_bit (FLAG_COMMIT , &ai->flags); - } else if ( !strncmp( line, "Channel: ", 9 ) ) { + } else if (!strncmp(line, "Channel: ", 9)) {int v, i =0 ; line +=9 ; v =get_dec_u16 (line, &i, i+3 ); -if ( v !=-1 ) { +if (v !=-1 ) { ai->config.channelSet =cpu_to_le16 (v);set_bit (FLAG_COMMIT , &ai->flags); } - } else if ( !strncmp( line, "XmitPower: ", 11 ) ) { + } else if (!strncmp(line, "XmitPower: ", 11)) {int v, i =0 ; line +=11 ; v =get_dec_u16 (line, &i, i+3 ); -if ( v !=-1 ) { +if (v !=-1 ) { ai->config.txPower =cpu_to_le16 (v);set_bit (FLAG_COMMIT , &ai->flags); } - } else if ( !strncmp( line, "WEP: ", 5 ) ) { + } else if (!strncmp(line, "WEP: ", 5)) { line +=5 ; -switch ( line[0 ] ) { +switch (line[0 ]) {case 's' :set_auth_type (ai,AUTH_SHAREDKEY );break ;
@@ -4899,7 +4921,7 @@ static void proc_config_on_close(struct inode *inode, struct file *file)break ; }set_bit (FLAG_COMMIT , &ai->flags); - }else if ( !strncmp ( line,"LongRetryLimit: " ,16 ) ) { + }else if (!strncmp (line,"LongRetryLimit: " ,16 )) {int v, i =0 ; line +=16 ;
@@ -4907,7 +4929,7 @@ static void proc_config_on_close(struct inode *inode, struct file *file) v = (v<0 ) ?0 : ((v>255 ) ?255 : v); ai->config.longRetryLimit =cpu_to_le16 (v);set_bit (FLAG_COMMIT , &ai->flags); - }else if ( !strncmp ( line,"ShortRetryLimit: " ,17 ) ) { + }else if (!strncmp (line,"ShortRetryLimit: " ,17 )) {int v, i =0 ; line +=17 ;
@@ -4915,7 +4937,7 @@ static void proc_config_on_close(struct inode *inode, struct file *file) v = (v<0 ) ?0 : ((v>255 ) ?255 : v); ai->config.shortRetryLimit =cpu_to_le16 (v);set_bit (FLAG_COMMIT , &ai->flags); - }else if ( !strncmp ( line,"RTSThreshold: " ,14 ) ) { + }else if (!strncmp (line,"RTSThreshold: " ,14 )) {int v, i =0 ; line +=14 ;
@@ -4923,7 +4945,7 @@ static void proc_config_on_close(struct inode *inode, struct file *file) v = (v<0 ) ?0 : ((v>AIRO_DEF_MTU ) ?AIRO_DEF_MTU : v); ai->config.rtsThres =cpu_to_le16 (v);set_bit (FLAG_COMMIT , &ai->flags); - }else if ( !strncmp ( line,"TXMSDULifetime: " ,16 ) ) { + }else if (!strncmp (line,"TXMSDULifetime: " ,16 )) {int v, i =0 ; line +=16 ;
@@ -4931,7 +4953,7 @@ static void proc_config_on_close(struct inode *inode, struct file *file) v = (v<0 ) ?0 : v; ai->config.txLifetime =cpu_to_le16 (v);set_bit (FLAG_COMMIT , &ai->flags); - }else if ( !strncmp ( line,"RXMSDULifetime: " ,16 ) ) { + }else if (!strncmp (line,"RXMSDULifetime: " ,16 )) {int v, i =0 ; line +=16 ;
@@ -4939,17 +4961,17 @@ static void proc_config_on_close(struct inode *inode, struct file *file) v = (v<0 ) ?0 : v; ai->config.rxLifetime =cpu_to_le16 (v);set_bit (FLAG_COMMIT , &ai->flags); - }else if ( !strncmp ( line,"TXDiversity: " ,13 ) ) { + }else if (!strncmp (line,"TXDiversity: " ,13 )) { ai->config.txDiversity = (line[13 ]=='l' ) ?1 : ((line[13 ]=='r' )?2 :3 );set_bit (FLAG_COMMIT , &ai->flags); - }else if ( !strncmp ( line,"RXDiversity: " ,13 ) ) { + }else if (!strncmp (line,"RXDiversity: " ,13 )) { ai->config.rxDiversity = (line[13 ]=='l' ) ?1 : ((line[13 ]=='r' )?2 :3 );set_bit (FLAG_COMMIT , &ai->flags); - }else if ( !strncmp ( line,"FragThreshold: " ,15 ) ) { + }else if (!strncmp (line,"FragThreshold: " ,15 )) {int v, i =0 ; line +=15 ;
@@ -4961,24 +4983,24 @@ static void proc_config_on_close(struct inode *inode, struct file *file) }else if (!strncmp (line,"Modulation: " ,12 )) { line +=12 ;switch (*line) { -case 'd' : ai->config.modulation=MOD_DEFAULT ;set_bit (FLAG_COMMIT , &ai->flags);break ; -case 'c' : ai->config.modulation=MOD_CCK ;set_bit (FLAG_COMMIT , &ai->flags);break ; -case 'm' : ai->config.modulation=MOD_MOK ;set_bit (FLAG_COMMIT , &ai->flags);break ; +case 'd' : ai->config.modulation =MOD_DEFAULT ;set_bit (FLAG_COMMIT , &ai->flags);break ; +case 'c' : ai->config.modulation =MOD_CCK ;set_bit (FLAG_COMMIT , &ai->flags);break ; +case 'm' : ai->config.modulation =MOD_MOK ;set_bit (FLAG_COMMIT , &ai->flags);break ;default :airo_print_warn (ai->dev->name,"Unknown modulation" ); } }else if (!strncmp (line,"Preamble: " ,10 )) { line +=10 ;switch (*line) { -case 'a' : ai->config.preamble=PREAMBLE_AUTO ;set_bit (FLAG_COMMIT , &ai->flags);break ; -case 'l' : ai->config.preamble=PREAMBLE_LONG ;set_bit (FLAG_COMMIT , &ai->flags);break ; -case 's' : ai->config.preamble=PREAMBLE_SHORT ;set_bit (FLAG_COMMIT , &ai->flags);break ; +case 'a' : ai->config.preamble =PREAMBLE_AUTO ;set_bit (FLAG_COMMIT , &ai->flags);break ; +case 'l' : ai->config.preamble =PREAMBLE_LONG ;set_bit (FLAG_COMMIT , &ai->flags);break ; +case 's' : ai->config.preamble =PREAMBLE_SHORT ;set_bit (FLAG_COMMIT , &ai->flags);break ;default :airo_print_warn (ai->dev->name,"Unknown preamble" ); } }else {airo_print_warn (ai->dev->name,"Couldn't figure out %s" , line); } -while ( line[0 ] && line[0 ] !='\n' ) line++; -if ( line[0 ] ) line++; +while (line[0 ] && line[0 ] !='\n' ) line++; +if (line[0 ]) line++; }airo_config_commit (dev,NULL ,NULL ,NULL ); }
@@ -5001,14 +5023,14 @@ static int proc_config_open(struct inode *inode, struct file *file)int i;__le16 mode; -if ((file->private_data =kzalloc (sizeof (struct proc_data ),GFP_KERNEL )) ==NULL ) +if ((file->private_data =kzalloc (sizeof (struct proc_data ),GFP_KERNEL )) ==NULL )return -ENOMEM ; data = file->private_data; -if ((data->rbuffer =kmalloc (2048 ,GFP_KERNEL )) ==NULL ) { +if ((data->rbuffer =kmalloc (2048 ,GFP_KERNEL )) ==NULL ) {kfree (file->private_data);return -ENOMEM ; } -if ((data->wbuffer =kzalloc (2048 ,GFP_KERNEL )) ==NULL ) { +if ((data->wbuffer =kzalloc (2048 ,GFP_KERNEL )) ==NULL ) {kfree (data->rbuffer);kfree (file->private_data);return -ENOMEM ;
@@ -5019,7 +5041,7 @@ static int proc_config_open(struct inode *inode, struct file *file)readConfigRid (ai,1 ); mode = ai->config.opmode &MODE_CFG_MASK ; - i =sprintf ( data->rbuffer, + i =sprintf (data->rbuffer,"Mode: %s\n" "Radio: %s\n" "NodeName: %-16s\n"
@@ -5048,7 +5070,7 @@ static int proc_config_open(struct inode *inode, struct file *file)le16_to_cpu (ai->config.channelSet),le16_to_cpu (ai->config.txPower) ); -sprintf ( data->rbuffer + i, +sprintf (data->rbuffer + i,"LongRetryLimit: %d\n" "ShortRetryLimit: %d\n" "RTSThreshold: %d\n"
@@ -5079,7 +5101,7 @@ static int proc_config_open(struct inode *inode, struct file *file) ai->config.preamble ==PREAMBLE_LONG ?"long" : ai->config.preamble ==PREAMBLE_SHORT ?"short" :"error" ); - data->readlen =strlen ( data->rbuffer ); + data->readlen =strlen (data->rbuffer);return 0 ; }
@@ -5119,14 +5141,15 @@ static void proc_SSID_on_close(struct inode *inode, struct file *file)enable_MAC (ai,1 ); } -static void proc_APList_on_close (struct inode *inode,struct file *file ) { +static void proc_APList_on_close (struct inode *inode,struct file *file) +{struct proc_data *data = file->private_data;struct net_device *dev =PDE_DATA (inode);struct airo_info *ai = dev->ml_priv;APListRid *APList_rid = &ai->APList;int i; -if ( !data->writelen )return ; +if (!data->writelen)return ;memset (APList_rid,0 ,sizeof (*APList_rid)); APList_rid->len =cpu_to_le16 (sizeof (*APList_rid));
@@ -5140,8 +5163,9 @@ static void proc_APList_on_close( struct inode *inode, struct file *file ) { }/* This function wraps PC4500_writerid with a MAC disable */ -static int do_writerid (struct airo_info *ai,u16 rid,const void *rid_data, -int len,int dummy ) { +static int do_writerid (struct airo_info *ai,u16 rid,const void *rid_data, +int len,int dummy) +{int rc;disable_MAC (ai,1 );
@@ -5241,7 +5265,8 @@ static int set_wep_tx_idx(struct airo_info *ai, u16 index, int perm, int lock)return rc; } -static void proc_wepkey_on_close (struct inode *inode,struct file *file ) { +static void proc_wepkey_on_close (struct inode *inode,struct file *file) +{struct proc_data *data;struct net_device *dev =PDE_DATA (inode);struct airo_info *ai = dev->ml_priv;
@@ -5253,7 +5278,7 @@ static void proc_wepkey_on_close( struct inode *inode, struct file *file ) {memset (key,0 ,sizeof (key)); data = file->private_data; -if ( !data->writelen )return ; +if (!data->writelen)return ;if (data->wbuffer[0 ] >='0' && data->wbuffer[0 ] <='3' && (data->wbuffer[1 ] ==' ' || data->wbuffer[1 ] =='\n' )) {
@@ -5273,7 +5298,7 @@ static void proc_wepkey_on_close( struct inode *inode, struct file *file ) {return ; } -for ( i =0 ; i <16 *3 && data->wbuffer[i+j]; i++ ) { +for (i =0 ; i <16 *3 && data->wbuffer[i+j]; i++) {switch (i%3 ) {case 0 : key[i/3 ] =hex_to_bin (data->wbuffer[i+j])<<4 ;
@@ -5291,7 +5316,7 @@ static void proc_wepkey_on_close( struct inode *inode, struct file *file ) { } } -static int proc_wepkey_open (struct inode *inode,struct file *file ) +static int proc_wepkey_open (struct inode *inode,struct file *file) {struct proc_data *data;struct net_device *dev =PDE_DATA (inode);
@@ -5299,20 +5324,20 @@ static int proc_wepkey_open( struct inode *inode, struct file *file )char *ptr;WepKeyRid wkr;__le16 lastindex; -int j=0 ; +int j =0 ;int rc; -if ((file->private_data =kzalloc (sizeof (struct proc_data ),GFP_KERNEL )) ==NULL ) +if ((file->private_data =kzalloc (sizeof (struct proc_data ),GFP_KERNEL )) ==NULL )return -ENOMEM ;memset (&wkr,0 ,sizeof (wkr)); data = file->private_data; -if ((data->rbuffer =kzalloc (180 ,GFP_KERNEL )) ==NULL ) { +if ((data->rbuffer =kzalloc (180 ,GFP_KERNEL )) ==NULL ) {kfree (file->private_data);return -ENOMEM ; } data->writelen =0 ; data->maxwritelen =80 ; -if ((data->wbuffer =kzalloc (80 ,GFP_KERNEL )) ==NULL ) { +if ((data->wbuffer =kzalloc (80 ,GFP_KERNEL )) ==NULL ) {kfree (data->rbuffer);kfree (file->private_data);return -ENOMEM ;
@@ -5333,9 +5358,9 @@ static int proc_wepkey_open( struct inode *inode, struct file *file ) le16_to_cpu(wkr.klen)); }readWepKeyRid (ai, &wkr,0 ,1 ); - }while ((lastindex != wkr.kindex) && (j <180 -30 )); + }while ((lastindex != wkr.kindex) && (j <180 -30 )); - data->readlen =strlen ( data->rbuffer ); + data->readlen =strlen (data->rbuffer);return 0 ; }
@@ -5348,10 +5373,10 @@ static int proc_SSID_open(struct inode *inode, struct file *file)char *ptr;SsidRid SSID_rid; -if ((file->private_data =kzalloc (sizeof (struct proc_data ),GFP_KERNEL )) ==NULL ) +if ((file->private_data =kzalloc (sizeof (struct proc_data ),GFP_KERNEL )) ==NULL )return -ENOMEM ; data = file->private_data; -if ((data->rbuffer =kmalloc (104 ,GFP_KERNEL )) ==NULL ) { +if ((data->rbuffer =kmalloc (104 ,GFP_KERNEL )) ==NULL ) {kfree (file->private_data);return -ENOMEM ; }
@@ -5379,11 +5404,12 @@ static int proc_SSID_open(struct inode *inode, struct file *file) *ptr++ ='\n' ; } *ptr ='\0' ; - data->readlen =strlen ( data->rbuffer ); + data->readlen =strlen (data->rbuffer);return 0 ; } -static int proc_APList_open (struct inode *inode,struct file *file ) { +static int proc_APList_open (struct inode *inode,struct file *file) +{struct proc_data *data;struct net_device *dev =PDE_DATA (inode);struct airo_info *ai = dev->ml_priv;
@@ -5391,16 +5417,16 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {char *ptr;APListRid *APList_rid = &ai->APList; -if ((file->private_data =kzalloc (sizeof (struct proc_data ),GFP_KERNEL )) ==NULL ) +if ((file->private_data =kzalloc (sizeof (struct proc_data ),GFP_KERNEL )) ==NULL )return -ENOMEM ; data = file->private_data; -if ((data->rbuffer =kmalloc (104 ,GFP_KERNEL )) ==NULL ) { +if ((data->rbuffer =kmalloc (104 ,GFP_KERNEL )) ==NULL ) {kfree (file->private_data);return -ENOMEM ; } data->writelen =0 ; data->maxwritelen =4 *6 *3 ; -if ((data->wbuffer =kzalloc ( data->maxwritelen,GFP_KERNEL )) ==NULL ) { +if ((data->wbuffer =kzalloc (data->maxwritelen,GFP_KERNEL )) ==NULL ) {kfree (data->rbuffer);kfree (file->private_data);return -ENOMEM ;
@@ -5408,20 +5434,21 @@ static int proc_APList_open( struct inode *inode, struct file *file ) { data->on_close = proc_APList_on_close; ptr = data->rbuffer; -for ( i =0 ; i <4 ; i++ ) { +for (i =0 ; i <4 ; i++) {// We end when we find a zero MAC -if ( !*(int *)APList_rid->ap[i] && +if (!*(int *)APList_rid->ap[i] && !*(int *)&APList_rid->ap[i][2 ])break ; ptr +=sprintf (ptr,"%pM\n" , APList_rid->ap[i]); }if (i==0 ) ptr +=sprintf (ptr,"Not using specific APs\n" ); *ptr ='\0' ; - data->readlen =strlen ( data->rbuffer ); + data->readlen =strlen (data->rbuffer);return 0 ; } -static int proc_BSSList_open (struct inode *inode,struct file *file ) { +static int proc_BSSList_open (struct inode *inode,struct file *file) +{struct proc_data *data;struct net_device *dev =PDE_DATA (inode);struct airo_info *ai = dev->ml_priv;
@@ -5431,10 +5458,10 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {/* If doLoseSync is not 1, we won't do a Lose Sync */ int doLoseSync =-1 ; -if ((file->private_data =kzalloc (sizeof (struct proc_data ),GFP_KERNEL )) ==NULL ) +if ((file->private_data =kzalloc (sizeof (struct proc_data ),GFP_KERNEL )) ==NULL )return -ENOMEM ; data = file->private_data; -if ((data->rbuffer =kmalloc (1024 ,GFP_KERNEL )) ==NULL ) { +if ((data->rbuffer =kmalloc (1024 ,GFP_KERNEL )) ==NULL ) {kfree (file->private_data);return -ENOMEM ; }
@@ -5454,7 +5481,7 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {return -ENETDOWN ; }memset (&cmd,0 ,sizeof (cmd)); - cmd.cmd=CMD_LISTBSS ; + cmd.cmd =CMD_LISTBSS ;if (down_interruptible (&ai->sem)) {kfree (data->rbuffer);kfree (file->private_data);
@@ -5472,7 +5499,7 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {Since it is a rare condition, we'll just live with it, otherwise we have to add a spin lock... */ rc =readBSSListRid (ai, doLoseSync, &BSSList_rid); -while (rc ==0 && BSSList_rid.index !=cpu_to_le16 (0xffff )) { +while (rc ==0 && BSSList_rid.index !=cpu_to_le16 (0xffff )) { ptr += sprintf(ptr, "%pM %.*s rssi = %d", BSSList_rid.bssid, (int)BSSList_rid.ssidLen,
@@ -5487,11 +5514,11 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) { rc =readBSSListRid (ai,0 , &BSSList_rid); } *ptr ='\0' ; - data->readlen =strlen ( data->rbuffer ); + data->readlen =strlen (data->rbuffer);return 0 ; } -static int proc_close (struct inode *inode,struct file *file ) +static int proc_close (struct inode *inode,struct file *file) {struct proc_data *data = file->private_data;
@@ -5508,7 +5535,8 @@ static int proc_close( struct inode *inode, struct file *file )will switch WEP modes to see if that will help. If the card is associated we will check every minute to see if anything has changed. */ -static void timer_func (struct net_device *dev ) { +static void timer_func (struct net_device *dev) +{struct airo_info *apriv = dev->ml_priv;/* We don't have a link so try changing the authtype */
@@ -5642,7 +5670,7 @@ static int __maybe_unused airo_pci_resume(struct device *dev_d) }#endif -static int __init airo_init_module (void ) +static int __init airo_init_module (void ) {int i;
@@ -5658,8 +5686,8 @@ static int __init airo_init_module( void )for (i =0 ; i <4 && io[i] && irq[i]; i++) {airo_print_info ("" ,"Trying to configure ISA adapter at irq=%d " -"io=0x%x" , irq[i], io[i] ); -if (init_airo_card ( irq[i], io[i],0 ,NULL )) { +"io = 0x%x" , irq[i], io[i]); +if (init_airo_card (irq[i], io[i],0 ,NULL )) {/* do nothing */ ; } }
@@ -5681,10 +5709,10 @@ static int __init airo_init_module( void )return 0 ; } -static void __exit airo_cleanup_module( void ) +static void __exit airo_cleanup_module(void) {struct airo_info *ai; -while (!list_empty (&airo_devices)) { +while (!list_empty (&airo_devices)) { ai = list_entry(airo_devices.next, struct airo_info, dev_list);airo_print_info (ai->dev->name,"Unregistering..." );stop_airo_card (ai->dev,1 );
@@ -5784,7 +5812,7 @@ static int airo_set_freq(struct net_device *dev,int rc = -EINPROGRESS ;/* Call commit handler */ /* If setting by frequency, convert to a channel */ -if (fwrq->e ==1 ) { +if (fwrq->e ==1 ) {int f = fwrq->m /100000 ;/* Hack to fall through... */
@@ -5798,7 +5826,7 @@ static int airo_set_freq(struct net_device *dev,int channel = fwrq->m;/* We should do a better check than that, * based on the card capability !!! */ -if ((channel <1 ) || (channel >14 )) { +if ((channel <1 ) || (channel >14 )) {airo_print_dbg (dev->name,"New channel value of %d is invalid!" , fwrq->m); rc = -EINVAL ;
@@ -5832,7 +5860,7 @@ static int airo_get_freq(struct net_device *dev,readStatusRid (local, &status_rid,1 ); ch =le16_to_cpu (status_rid.channel); -if ((ch >0 ) && (ch <15 )) { +if ((ch >0 ) && (ch <15 )) { fwrq->m =100000 *ieee80211_channel_to_frequency (ch,NL80211_BAND_2GHZ ); fwrq->e =1 ;
@@ -5936,7 +5964,7 @@ static int airo_set_wap(struct net_device *dev,else if (is_broadcast_ether_addr (awrq->sa_data) ||is_zero_ether_addr (awrq->sa_data)) {memset (&cmd,0 ,sizeof (cmd)); - cmd.cmd=CMD_LOSE_SYNC ; + cmd.cmd =CMD_LOSE_SYNC ;if (down_interruptible (&local->sem))return -ERESTARTSYS ;issuecommand (local, &cmd, &rsp);
@@ -5985,7 +6013,7 @@ static int airo_set_nick(struct net_device *dev,struct airo_info *local = dev->ml_priv;/* Check the size of the string */ -if (dwrq->length >16 ) { +if (dwrq->length >16 ) {return -E2BIG ; }readConfigRid (local,1 );
@@ -6033,7 +6061,7 @@ static int airo_set_rate(struct net_device *dev,readCapabilityRid (local, &cap_rid,1 );/* Which type of value ? */ -if ((vwrq->value <8 ) && (vwrq->value >=0 )) { +if ((vwrq->value <8 ) && (vwrq->value >=0 )) {/* Setting by rate index */ /* Find value in the magic rate table */ brate = cap_rid.supportedRates[vwrq->value];
@@ -6042,36 +6070,36 @@ static int airo_set_rate(struct net_device *dev,u8 normvalue = (u8) (vwrq->value/500000 );/* Check if rate is valid */ -for (i =0 ; i <8 ; i++) { -if (normvalue == cap_rid.supportedRates[i]) { +for (i =0 ; i <8 ; i++) { +if (normvalue == cap_rid.supportedRates[i]) { brate = normvalue;break ; } } }/* -1 designed the max rate (mostly auto mode) */ -if (vwrq->value ==-1 ) { +if (vwrq->value ==-1 ) {/* Get the highest available rate */ -for (i =0 ; i <8 ; i++) { -if (cap_rid.supportedRates[i] ==0 ) +for (i =0 ; i <8 ; i++) { +if (cap_rid.supportedRates[i] ==0 )break ; } -if (i !=0 ) +if (i !=0 ) brate = cap_rid.supportedRates[i -1 ]; }/* Check that it is valid */ -if (brate ==0 ) { +if (brate ==0 ) {return -EINVAL ; }readConfigRid (local,1 );/* Now, check if we want a fixed or auto value */ -if (vwrq->fixed ==0 ) { +if (vwrq->fixed ==0 ) {/* Fill all the rates up to this max rate */ memset (local->config.rates,0 ,8 ); -for (i =0 ; i <8 ; i++) { +for (i =0 ; i <8 ; i++) { local->config.rates[i] = cap_rid.supportedRates[i]; -if (local->config.rates[i] == brate) +if (local->config.rates[i] == brate)break ; } }else {
@@ -6119,9 +6147,9 @@ static int airo_set_rts(struct net_device *dev,struct airo_info *local = dev->ml_priv;int rthr = vwrq->value; -if (vwrq->disabled) +if (vwrq->disabled) rthr =AIRO_DEF_MTU ; -if ((rthr <0 ) || (rthr >AIRO_DEF_MTU )) { +if ((rthr <0 ) || (rthr >AIRO_DEF_MTU )) {return -EINVAL ; }readConfigRid (local,1 );
@@ -6162,9 +6190,9 @@ static int airo_set_frag(struct net_device *dev,struct airo_info *local = dev->ml_priv;int fthr = vwrq->value; -if (vwrq->disabled) +if (vwrq->disabled) fthr =AIRO_DEF_MTU ; -if ((fthr <256 ) || (fthr >AIRO_DEF_MTU )) { +if ((fthr <256 ) || (fthr >AIRO_DEF_MTU )) {return -EINVAL ; } fthr &= ~0x1 ;/* Get an even value - is it really needed ??? */
@@ -6341,7 +6369,7 @@ static int airo_set_encode(struct net_device *dev,else key.len =MIN_KEY_SIZE ;/* Check if the key is not marked as invalid */ -if (!(dwrq->flags &IW_ENCODE_NOKEY )) { +if (!(dwrq->flags &IW_ENCODE_NOKEY )) {/* Cleanup */ memset (key.key,0 ,MAX_KEY_SIZE );/* Copy the key in the driver */
@@ -6358,7 +6386,7 @@ static int airo_set_encode(struct net_device *dev,/* WE specify that if a valid key is set, encryption * should be enabled (user may turn it off later) * This is also how "iwconfig ethX key on" works */ -if ((index == current_index) && (key.len >0 ) && +if ((index == current_index) && (key.len >0 ) && (local->config.authType ==AUTH_OPEN ))set_auth_type (local,AUTH_ENCRYPT ); }else {
@@ -6381,7 +6409,7 @@ static int airo_set_encode(struct net_device *dev,/* Read the flags */ if (dwrq->flags &IW_ENCODE_DISABLED )set_auth_type (local,AUTH_OPEN );/* disable encryption */ -if (dwrq->flags &IW_ENCODE_RESTRICTED ) +if (dwrq->flags &IW_ENCODE_RESTRICTED )set_auth_type (local,AUTH_SHAREDKEY );/* Only Both */ if (dwrq->flags &IW_ENCODE_OPEN )set_auth_type (local,AUTH_ENCRYPT );/* Only Wep */
@@ -6459,7 +6487,7 @@ static int airo_set_encodeext(struct net_device *dev,struct airo_info *local = dev->ml_priv;struct iw_point *encoding = &wrqu->encoding;struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; -int perm = ( encoding->flags &IW_ENCODE_TEMP ?0 :1 ); +int perm = (encoding->flags &IW_ENCODE_TEMP ?0 :1 );__le16 currentAuthType = local->config.authType;int idx, key_len, alg = ext->alg, set_key =1 , rc;wep_key_t key;
@@ -6541,7 +6569,7 @@ static int airo_set_encodeext(struct net_device *dev,/* Read the flags */ if (encoding->flags &IW_ENCODE_DISABLED )set_auth_type (local,AUTH_OPEN );/* disable encryption */ -if (encoding->flags &IW_ENCODE_RESTRICTED ) +if (encoding->flags &IW_ENCODE_RESTRICTED )set_auth_type (local,AUTH_SHAREDKEY );/* Only Both */ if (encoding->flags &IW_ENCODE_OPEN )set_auth_type (local,AUTH_ENCRYPT );
@@ -6607,7 +6635,7 @@ static int airo_get_encodeext(struct net_device *dev,/* We can't return the key, so set the proper flag and return zero */ encoding->flags |=IW_ENCODE_NOKEY ;memset (extra,0 ,16 ); - +/* Copy the key to the user buffer */ wep_key_len =get_wep_key (local, idx, &buf[0 ],sizeof (buf));if (wep_key_len <0 ) {
@@ -6807,13 +6835,13 @@ static int airo_set_retry(struct net_device *dev,struct airo_info *local = dev->ml_priv;int rc = -EINVAL ; -if (vwrq->disabled) { +if (vwrq->disabled) {return -EINVAL ; }readConfigRid (local,1 ); -if (vwrq->flags &IW_RETRY_LIMIT ) { +if (vwrq->flags &IW_RETRY_LIMIT ) {__le16 v =cpu_to_le16 (vwrq->value); -if (vwrq->flags &IW_RETRY_LONG ) +if (vwrq->flags &IW_RETRY_LONG ) local->config.longRetryLimit = v;else if (vwrq->flags &IW_RETRY_SHORT ) local->config.shortRetryLimit = v;
@@ -6825,7 +6853,7 @@ static int airo_set_retry(struct net_device *dev,set_bit (FLAG_COMMIT , &local->flags); rc = -EINPROGRESS ;/* Call commit handler */ } -if (vwrq->flags &IW_RETRY_LIFETIME ) { +if (vwrq->flags &IW_RETRY_LIFETIME ) { local->config.txLifetime =cpu_to_le16 (vwrq->value /1024 );set_bit (FLAG_COMMIT , &local->flags); rc = -EINPROGRESS ;/* Call commit handler */
@@ -6848,16 +6876,16 @@ static int airo_get_retry(struct net_device *dev,readConfigRid (local,1 );/* Note : by default, display the min retry number */ -if ((vwrq->flags &IW_RETRY_TYPE ) ==IW_RETRY_LIFETIME ) { +if ((vwrq->flags &IW_RETRY_TYPE ) ==IW_RETRY_LIFETIME ) { vwrq->flags =IW_RETRY_LIFETIME ; vwrq->value =le16_to_cpu (local->config.txLifetime) *1024 ; - }else if ((vwrq->flags &IW_RETRY_LONG )) { + }else if ((vwrq->flags &IW_RETRY_LONG )) { vwrq->flags =IW_RETRY_LIMIT |IW_RETRY_LONG ; vwrq->value =le16_to_cpu (local->config.longRetryLimit); }else { vwrq->flags =IW_RETRY_LIMIT ; vwrq->value =le16_to_cpu (local->config.shortRetryLimit); -if (local->config.shortRetryLimit != local->config.longRetryLimit) +if (local->config.shortRetryLimit != local->config.longRetryLimit) vwrq->flags |=IW_RETRY_SHORT ; }
@@ -6889,7 +6917,7 @@ static int airo_get_range(struct net_device *dev,/* Should be based on cap_rid.country to give only * what the current card support */ k =0 ; -for (i =0 ; i <14 ; i++) { +for (i =0 ; i <14 ; i++) { range->freq[k].i = i +1 ;/* List index */ range->freq[k].m =100000 *ieee80211_channel_to_frequency (i +1 ,NL80211_BAND_2GHZ );
@@ -6919,9 +6947,9 @@ static int airo_get_range(struct net_device *dev, } range->avg_qual.noise =0x100 -85 ;/* -85 dBm */ -for (i =0 ; i <8 ; i++) { +for (i =0 ; i <8 ; i++) { range->bitrate[i] = cap_rid.supportedRates[i] *500000 ; -if (range->bitrate[i] ==0 ) +if (range->bitrate[i] ==0 )break ; } range->num_bitrates = i;
@@ -6929,7 +6957,7 @@ static int airo_get_range(struct net_device *dev,/* Set an indication of the max TCP throughput * in bit/s that we can expect using this interface. * May be use for QoS stuff... Jean II */ -if (i >2 ) +if (i >2 ) range->throughput =5000 *1000 ;else range->throughput =1500 *1000 ;
@@ -6939,7 +6967,7 @@ static int airo_get_range(struct net_device *dev, range->min_frag =256 ; range->max_frag =AIRO_DEF_MTU ; -if (cap_rid.softCap &cpu_to_le16 (2 )) { +if (cap_rid.softCap &cpu_to_le16 (2 )) {// WEP: RC4 40 bits range->encoding_size[0 ] =5 ;// RC4 ~128 bits
@@ -6963,9 +6991,9 @@ static int airo_get_range(struct net_device *dev, range->pm_capa =IW_POWER_PERIOD |IW_POWER_TIMEOUT |IW_POWER_ALL_R ;/* Transmit Power - values are in mW */ -for (i =0 ; i <8 ; i++) { +for (i =0 ; i <8 ; i++) { range->txpower[i] =le16_to_cpu (cap_rid.txPowerLevels[i]); -if (range->txpower[i] ==0 ) +if (range->txpower[i] ==0 )break ; } range->num_txpower = i;
@@ -7236,7 +7264,7 @@ static int airo_set_scan(struct net_device *dev,/* Initiate a scan command */ ai->scan_timeout =RUN_AT (3 *HZ );memset (&cmd,0 ,sizeof (cmd)); - cmd.cmd=CMD_LISTBSS ; + cmd.cmd =CMD_LISTBSS ;issuecommand (ai, &cmd, &rsp); wake =1 ;
@@ -7277,7 +7305,7 @@ static inline char *airo_translate_scan(struct net_device *dev,/* Add the ESSID */ iwe.u.data.length = bss->ssidLen; -if (iwe.u.data.length >32 ) +if (iwe.u.data.length >32 ) iwe.u.data.length =32 ; iwe.cmd =SIOCGIWESSID ; iwe.u.data.flags =1 ;
@@ -7287,8 +7315,8 @@ static inline char *airo_translate_scan(struct net_device *dev,/* Add mode */ iwe.cmd =SIOCGIWMODE ; capabilities = bss->cap; -if (capabilities & (CAP_ESS |CAP_IBSS )) { -if (capabilities &CAP_ESS ) +if (capabilities & (CAP_ESS |CAP_IBSS )) { +if (capabilities &CAP_ESS ) iwe.u.mode =IW_MODE_MASTER ;else iwe.u.mode =IW_MODE_ADHOC ;
@@ -7328,7 +7356,7 @@ static inline char *airo_translate_scan(struct net_device *dev,/* Add encryption capability */ iwe.cmd =SIOCGIWENCODE ; -if (capabilities &CAP_PRIVACY ) +if (capabilities &CAP_PRIVACY ) iwe.u.data.flags =IW_ENCODE_ENABLED |IW_ENCODE_NOKEY ;else iwe.u.data.flags =IW_ENCODE_DISABLED ;
@@ -7344,9 +7372,9 @@ static inline char *airo_translate_scan(struct net_device *dev,/* Those two flags are ignored... */ iwe.u.bitrate.fixed = iwe.u.bitrate.disabled =0 ;/* Max 8 values */ -for (i =0 ; i <8 ; i++) { +for (i =0 ; i <8 ; i++) {/* NULL terminated */ -if (bss->rates[i] ==0 ) +if (bss->rates[i] ==0 )break ;/* Bit rate given in 500 kb/s units (+ 0x80) */ iwe.u.bitrate.value = ((bss->rates[i] &0x7f ) *500000 );
@@ -7454,7 +7482,7 @@ static int airo_get_scan(struct net_device *dev, &net->bss);/* Check if there is space for one more entry */ -if ((extra + dwrq->length - current_ev) <=IW_EV_ADDR_LEN ) { +if ((extra + dwrq->length - current_ev) <=IW_EV_ADDR_LEN ) {/* Ask user space to try again with a bigger buffer */ err = -E2BIG ; goto out;
@@ -7492,7 +7520,7 @@ static int airo_config_commit(struct net_device *dev,readSsidRid (local, &SSID_rid);if (test_bit (FLAG_MPI ,&local->flags)) -setup_card (local, dev->dev_addr,1 ); +setup_card (local, dev->dev_addr,1 );else reset_airo_card (dev);disable_MAC (local,1 );
@@ -7636,9 +7664,9 @@ static int airo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {int val =AIROMAGIC ;aironet_ioctl com; -if (copy_from_user (&com,rq->ifr_data,sizeof (com))) +if (copy_from_user (&com, rq->ifr_data,sizeof (com))) rc = -EFAULT ; -else if (copy_to_user (com.data,(char *)&val,sizeof (val))) +else if (copy_to_user (com.data, (char *)&val,sizeof (val))) rc = -EFAULT ; }break ;
@@ -7652,24 +7680,24 @@ static int airo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)*/ {aironet_ioctl com; -if (copy_from_user (&com,rq->ifr_data,sizeof (com))) { +if (copy_from_user (&com, rq->ifr_data,sizeof (com))) { rc = -EFAULT ;break ; }/* Separate R/W functions bracket legality here */ -if ( com.command ==AIRORSWVERSION ) { +if (com.command ==AIRORSWVERSION ) {if (copy_to_user (com.data, swversion,sizeof (swversion))) rc = -EFAULT ;else rc =0 ; } -else if ( com.command <=AIRORRID ) +else if (com.command <=AIRORRID ) rc =readrids (dev,&com); -else if ( com.command >=AIROPCAP && com.command <= (AIROPLEAPUSR +2 ) ) +else if (com.command >=AIROPCAP && com.command <= (AIROPLEAPUSR +2 )) rc =writerids (dev,&com); -else if ( com.command >=AIROFLSHRST && com.command <=AIRORESTART ) +else if (com.command >=AIROFLSHRST && com.command <=AIRORESTART ) rc =flashcard (dev,&com);else rc = -EINVAL ;/* Bad command in ioctl */
@@ -7771,7 +7799,8 @@ static struct iw_statistics *airo_get_wireless_stats(struct net_device *dev)* as needed. This represents the READ side of control I/O to * the card */ -static int readrids (struct net_device *dev,aironet_ioctl *comp) { +static int readrids (struct net_device *dev,aironet_ioctl *comp) +{unsigned short ridcode;unsigned char *iobuf;int len;
@@ -7801,7 +7830,7 @@ static int readrids(struct net_device *dev, aironet_ioctl *comp) {case AIROGSTATSC32 : ridcode =RID_STATS ;break ;case AIROGMICSTATS :if (copy_to_user (comp->data, &ai->micstats, -min ((int )comp->len,(int )sizeof (ai->micstats)))) +min ((int )comp->len, (int )sizeof (ai->micstats))))return -EFAULT ;return 0 ;case AIRORRID : ridcode = comp->ridnum;break ;
@@ -7818,7 +7847,7 @@ static int readrids(struct net_device *dev, aironet_ioctl *comp) {if ((iobuf =kzalloc (RIDSIZE ,GFP_KERNEL )) ==NULL )return -ENOMEM ; -PC4500_readrid (ai,ridcode,iobuf,RIDSIZE ,1 ); +PC4500_readrid (ai, ridcode, iobuf,RIDSIZE ,1 );/* get the count of bytes in the rid docs say 1st 2 bytes is it. * then return it to the user * 9/22/2000 Honor user given length
@@ -7837,7 +7866,8 @@ static int readrids(struct net_device *dev, aironet_ioctl *comp) {* Danger Will Robinson write the rids here */ -static int writerids (struct net_device *dev,aironet_ioctl *comp) { +static int writerids (struct net_device *dev,aironet_ioctl *comp) +{struct airo_info *ai = dev->ml_priv;int ridcode;int enabled;
@@ -7894,10 +7924,10 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {if ((iobuf =kmalloc (RIDSIZE ,GFP_KERNEL )) ==NULL )return -ENOMEM ; -PC4500_readrid (ai,RID_STATSDELTACLEAR ,iobuf,RIDSIZE ,1 ); +PC4500_readrid (ai,RID_STATSDELTACLEAR , iobuf,RIDSIZE ,1 ); enabled = ai->micstats.enabled; -memset (&ai->micstats,0 ,sizeof (ai->micstats)); +memset (&ai->micstats,0 ,sizeof (ai->micstats)); ai->micstats.enabled = enabled; if (copy_to_user(comp->data, iobuf,
@@ -7911,13 +7941,13 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {default :return -EOPNOTSUPP ;/* Blarg! */ } -if (comp->len >RIDSIZE ) +if (comp->len >RIDSIZE )return -EINVAL ;if ((iobuf =kmalloc (RIDSIZE ,GFP_KERNEL )) ==NULL )return -ENOMEM ; -if (copy_from_user (iobuf,comp->data,comp->len)) { +if (copy_from_user (iobuf, comp->data, comp->len)) {kfree (iobuf);return -EFAULT ; }
@@ -7934,7 +7964,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {clear_bit (FLAG_ADHOC , &ai->flags); } -if ((*writer)(ai, ridcode, iobuf,comp->len,1 )) { +if ((*writer)(ai, ridcode, iobuf, comp->len,1 )) {kfree (iobuf);return -EIO ; }
@@ -7951,7 +7981,8 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {* Flash command switch table */ -static int flashcard (struct net_device *dev,aironet_ioctl *comp) { +static int flashcard (struct net_device *dev,aironet_ioctl *comp) +{int z;/* Only super-user can modify flash */
@@ -7970,23 +8001,23 @@ static int flashcard(struct net_device *dev, aironet_ioctl *comp) {return setflashmode ((struct airo_info *)dev->ml_priv);case AIROFLSHGCHR :/* Get char from aux */ -if (comp->len !=sizeof (int )) +if (comp->len !=sizeof (int ))return -EINVAL ; -if (copy_from_user (&z,comp->data,comp->len)) +if (copy_from_user (&z, comp->data, comp->len))return -EFAULT ;return flashgchar ((struct airo_info *)dev->ml_priv, z,8000 );case AIROFLSHPCHR :/* Send char to card. */ -if (comp->len !=sizeof (int )) +if (comp->len !=sizeof (int ))return -EINVAL ; -if (copy_from_user (&z,comp->data,comp->len)) +if (copy_from_user (&z, comp->data, comp->len))return -EFAULT ;return flashpchar ((struct airo_info *)dev->ml_priv, z,8000 );case AIROFLPUTBUF :/* Send 32k to card */ if (!AIRO_FLASH (dev))return -ENOMEM ; -if (comp->len >FLASHSIZE ) +if (comp->len >FLASHSIZE )return -EINVAL ;if (copy_from_user (AIRO_FLASH (dev), comp->data, comp->len))return -EFAULT ;
@@ -8010,19 +8041,20 @@ static int flashcard(struct net_device *dev, aironet_ioctl *comp) {* card. */ -static int cmdreset (struct airo_info *ai) { +static int cmdreset (struct airo_info *ai) +{disable_MAC (ai,1 ); -if (!waitbusy (ai)){ +if (!waitbusy (ai)) {airo_print_info (ai->dev->name,"Waitbusy hang before RESET" );return -EBUSY ; } -OUT4500 (ai,COMMAND ,CMD_SOFTRESET ); +OUT4500 (ai,COMMAND ,CMD_SOFTRESET );ssleep (1 );/* WAS 600 12/7/00 */ -if (!waitbusy (ai)){ +if (!waitbusy (ai)) {airo_print_info (ai->dev->name,"Waitbusy hang AFTER RESET" );return -EBUSY ; }
@@ -8034,22 +8066,23 @@ static int cmdreset(struct airo_info *ai) {* mode */ -static int setflashmode (struct airo_info *ai) { +static int setflashmode (struct airo_info *ai) +{set_bit (FLAG_FLASHING , &ai->flags);OUT4500 (ai,SWS0 ,FLASH_COMMAND );OUT4500 (ai,SWS1 ,FLASH_COMMAND );if (probe) {OUT4500 (ai,SWS0 ,FLASH_COMMAND ); -OUT4500 (ai,COMMAND ,0x10 ); +OUT4500 (ai,COMMAND ,0x10 ); }else {OUT4500 (ai,SWS2 ,FLASH_COMMAND );OUT4500 (ai,SWS3 ,FLASH_COMMAND ); -OUT4500 (ai,COMMAND ,0 ); +OUT4500 (ai,COMMAND ,0 ); }msleep (500 );/* 500ms delay */ -if (!waitbusy (ai)) { +if (!waitbusy (ai)) {clear_bit (FLAG_FLASHING , &ai->flags);airo_print_info (ai->dev->name,"Waitbusy hang after setflash mode" );return -EIO ;
@@ -8061,16 +8094,17 @@ static int setflashmode (struct airo_info *ai) {* x 50us for echo . */ -static int flashpchar (struct airo_info *ai,int byte,int dwelltime) { +static int flashpchar (struct airo_info *ai,int byte,int dwelltime) +{int echo;int waittime; byte |=0x8000 ; -if (dwelltime ==0 ) +if (dwelltime ==0 ) dwelltime =200 ; - waittime=dwelltime; + waittime = dwelltime;/* Wait for busy bit d15 to go false indicating buffer empty */ while ((IN4500 (ai,SWS0 ) &0x8000 ) && waittime >0 ) {
@@ -8079,20 +8113,20 @@ static int flashpchar(struct airo_info *ai,int byte,int dwelltime) { }/* timeout for busy clear wait */ -if (waittime <=0 ){ +if (waittime <=0 ) {airo_print_info (ai->dev->name,"flash putchar busywait timeout!" );return -EBUSY ; }/* Port is clear now write byte and wait for it to echo back */ do { -OUT4500 (ai,SWS0 ,byte); +OUT4500 (ai,SWS0 , byte);udelay (50 ); dwelltime -=50 ; - echo =IN4500 (ai,SWS1 ); + echo =IN4500 (ai,SWS1 ); }while (dwelltime >=0 && echo != byte); -OUT4500 (ai,SWS1 ,0 ); +OUT4500 (ai,SWS1 ,0 );return (echo == byte) ?0 : -EIO ; }
@@ -8101,29 +8135,30 @@ static int flashpchar(struct airo_info *ai,int byte,int dwelltime) {* Get a character from the card matching matchbyte * Step 3) */ -static int flashgchar (struct airo_info *ai,int matchbyte,int dwelltime){ +static int flashgchar (struct airo_info *ai,int matchbyte,int dwelltime) +{int rchar; -unsigned char rbyte=0 ; +unsigned char rbyte =0 ;do { - rchar =IN4500 (ai,SWS1 ); + rchar =IN4500 (ai,SWS1 ); -if (dwelltime && !(0x8000 & rchar)){ +if (dwelltime && !(0x8000 & rchar)) { dwelltime -=10 ;mdelay (10 );continue ; } rbyte =0xff & rchar; -if ( (rbyte == matchbyte) && (0x8000 & rchar) ){ -OUT4500 (ai,SWS1 ,0 ); +if ((rbyte == matchbyte) && (0x8000 & rchar)) { +OUT4500 (ai,SWS1 ,0 );return 0 ; } -if ( rbyte ==0x81 || rbyte ==0x82 || rbyte ==0x83 || rbyte ==0x1a ||0xffff == rchar) +if (rbyte ==0x81 || rbyte ==0x82 || rbyte ==0x83 || rbyte ==0x1a ||0xffff == rchar)break ; -OUT4500 (ai,SWS1 ,0 ); +OUT4500 (ai,SWS1 ,0 ); - }while (dwelltime >0 ); + }while (dwelltime >0 );return -EIO ; }
@@ -8132,21 +8167,22 @@ static int flashgchar(struct airo_info *ai,int matchbyte,int dwelltime){* send to the card */ -static int flashputbuf (struct airo_info *ai){ +static int flashputbuf (struct airo_info *ai) +{int nwords;/* Write stuff */ if (test_bit (FLAG_MPI ,&ai->flags))memcpy_toio (ai->pciaux +0x8000 , ai->flash,FLASHSIZE );else { -OUT4500 (ai,AUXPAGE ,0x100 ); -OUT4500 (ai,AUXOFF ,0 ); +OUT4500 (ai,AUXPAGE ,0x100 ); +OUT4500 (ai,AUXOFF ,0 ); -for (nwords=0 ;nwords !=FLASHSIZE /2 ;nwords++){ -OUT4500 (ai,AUXDATA ,ai->flash[nwords] &0xffff ); +for (nwords =0 ; nwords !=FLASHSIZE /2 ; nwords++) { +OUT4500 (ai,AUXDATA , ai->flash[nwords] &0xffff ); } } -OUT4500 (ai,SWS0 ,0x8000 ); +OUT4500 (ai,SWS0 ,0x8000 );return 0 ; }
@@ -8154,8 +8190,9 @@ static int flashputbuf(struct airo_info *ai){/* * */ -static int flashrestart (struct airo_info *ai,struct net_device *dev){ -int i,status; +static int flashrestart (struct airo_info *ai,struct net_device *dev) +{ +int i, status;ssleep (1 );/* Added 12/7/00 */ clear_bit (FLAG_FLASHING , &ai->flags);
@@ -8167,9 +8204,9 @@ static int flashrestart(struct airo_info *ai,struct net_device *dev){ status =setup_card (ai, dev->dev_addr,1 );if (!test_bit (FLAG_MPI ,&ai->flags)) -for ( i =0 ; i <MAX_FIDS ; i++ ) { +for (i =0 ; i <MAX_FIDS ; i++) { ai->fids[i] =transmit_allocate - ( ai,AIRO_DEF_MTU , i >=MAX_FIDS /2 ); + (ai,AIRO_DEF_MTU , i >=MAX_FIDS /2 ); }ssleep (1 );/* Added 12/7/00 */
Signature · 1 line
2.25.1
Re: [PATCH 12/30] net: wireless: cisco: airo: Fix a myriad of coding style issues
Quoted 23 lines · Lee Jones
- Ensure spaces appear after {for, if, while, etc}
- Ensure spaces to not appear after '('
- Ensure spaces to not appear before ')'
- Ensure spaces appear between ')' and '{'
- Ensure spaces appear after ','
- Ensure spaces do not appear before ','
- Ensure spaces appear either side of '='
- Ensure '{'s which open functions are on a new line
- Remove trailing whitespaceThere are still a whole host of issues with this file, but this patch certainly breaks the back of them.
Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Benjamin Reed <[email protected]>Cc Javier Achirica <[email protected]>Cc Jean Tourrilhes <[email protected]>Cc Fabrice Bellet <[email protected]>Signed-off-by Lee Jones <[email protected]>
Quoted 3 lines
--- drivers/net/wireless/cisco/airo.c | 897 ++++++++++++++++-------------- 1 file changed, 467 insertions(+), 430 deletions(-)
This is a driver for ancient hardware, I'm not sure if it's worth trying to fix any style issues. Is anyone even using it? Should we instead just remove the driver?
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH 12/30] net: wireless: cisco: airo: Fix a myriad of coding style issues
Quoted 29 lines · Kalle Valo
Quoted 23 lines · Lee Jones
- Ensure spaces appear after {for, if, while, etc}
- Ensure spaces to not appear after '('
- Ensure spaces to not appear before ')'
- Ensure spaces appear between ')' and '{'
- Ensure spaces appear after ','
- Ensure spaces do not appear before ','
- Ensure spaces appear either side of '='
- Ensure '{'s which open functions are on a new line
- Remove trailing whitespaceThere are still a whole host of issues with this file, but this patch certainly breaks the back of them.
Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Benjamin Reed <[email protected]>Cc Javier Achirica <[email protected]>Cc Jean Tourrilhes <[email protected]>Cc Fabrice Bellet <[email protected]>Signed-off-by Lee Jones <[email protected]>Quoted 3 lines
--- drivers/net/wireless/cisco/airo.c | 897 ++++++++++++++++-------------- 1 file changed, 467 insertions(+), 430 deletions(-)
Quoted 3 lines
This is a driver for ancient hardware, I'm not sure if it's worth trying to fix any style issues. Is anyone even using it? Should we instead just remove the driver?
Sounds like a reasonable solution to me.
I'm also happy to do it, if there are no objections.
As it stands, it's polluting the code-base and the build-log, so something should be done.
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 12/30] net: wireless: cisco: airo: Fix a myriad of coding style issues
Quoted 35 lines · Lee Jones
Quoted 29 lines · Kalle Valo
Quoted 23 lines · Lee Jones
- Ensure spaces appear after {for, if, while, etc}
- Ensure spaces to not appear after '('
- Ensure spaces to not appear before ')'
- Ensure spaces appear between ')' and '{'
- Ensure spaces appear after ','
- Ensure spaces do not appear before ','
- Ensure spaces appear either side of '='
- Ensure '{'s which open functions are on a new line
- Remove trailing whitespaceThere are still a whole host of issues with this file, but this patch certainly breaks the back of them.
Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc Benjamin Reed <[email protected]>Cc Javier Achirica <[email protected]>Cc Jean Tourrilhes <[email protected]>Cc Fabrice Bellet <[email protected]>Signed-off-by Lee Jones <[email protected]>Quoted 3 lines
--- drivers/net/wireless/cisco/airo.c | 897 ++++++++++++++++-------------- 1 file changed, 467 insertions(+), 430 deletions(-)Quoted 3 lines
This is a driver for ancient hardware, I'm not sure if it's worth trying to fix any style issues. Is anyone even using it? Should we instead just remove the driver?
Quoted 6 lines
Sounds like a reasonable solution to me.
I'm also happy to do it, if there are no objections.
As it stands, it's polluting the code-base and the build-log, so something should be done.
I tried to find some comments about the driver and here's one successful report from 2013:
https://martybugs.net/wireless/aironet4800.cgi
And here's one commit from 2015 where Ondrej (CCed) was also testing the driver:
----------------------------------------------------------------------
commit dae0412d0caa4948da07fe4ad91352b5b61a70ec
Author: Ondrej Zary <[email protected]> AuthorDate: Fri Oct 16 21:04:14 2015 +0200 Commit: Kalle Valo <[email protected]> CommitDate: Wed Oct 28 20:54:39 2015 +0200
airo: fix scan after SIOCSIWAP (airo_set_wap)
SIOCSIWAP (airo_set_wap) affects scan: only the AP specified by SIOCSIWAP is present in scan results.
This makes NetworkManager work for the first time but then unable to find any other APs.
Clear APList before starting scan and set it back after scan completes to work-around the problem.
To avoid losing packets during scan, modify disable_MAC() to omit netif_carrier_off() call when lock == 2.
----------------------------------------------------------------------
I was surprised to see that someone was using this driver in 2015, so I'm not sure anymore what to do. Of course we could still just remove it and later revert if someone steps up and claims the driver is still usable. Hmm. Does anyone any users of this driver?
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH 12/30] net: wireless: cisco: airo: Fix a myriad of coding style issues
Quoted 4 lines · On Mon, 17 Aug 2020 16:27:01 +0300 Kalle Valo <[email protected]> wrote:
I was surprised to see that someone was using this driver in 2015, so I'm not sure anymore what to do. Of course we could still just remove it and later revert if someone steps up and claims the driver is still usable. Hmm. Does anyone any users of this driver?
What about moving the driver over into staging, which is generally the way I understood to move a driver slowly out of the kernel?
Re: [PATCH 12/30] net: wireless: cisco: airo: Fix a myriad of coding style issues
Quoted 10 lines · Jesse Brandeburg
Quoted 4 lines · On Mon, 17 Aug 2020 16:27:01 +0300 Kalle Valo <[email protected]> wrote:
I was surprised to see that someone was using this driver in 2015, so I'm not sure anymore what to do. Of course we could still just remove it and later revert if someone steps up and claims the driver is still usable. Hmm. Does anyone any users of this driver?
What about moving the driver over into staging, which is generally the way I understood to move a driver slowly out of the kernel?
I always thought Staging was used for *incoming* drivers?
Either way, Staging is on my hit list. It's actually next after Net.
Is there a Kconfig symbol that can be used to not include it in the standard builds? I'm aware of BROKEN. Is there anything more suitable for a deprecated driver (I don't see a DEPRECATED symbol).
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 12/30] net: wireless: cisco: airo: Fix a myriad of coding style issues
In reply to Jesse BrandeburgQuoted 10 lines · On Monday 17 August 2020 20:27:06 Jesse Brandeburg wrote:
Quoted 4 lines · On Mon, 17 Aug 2020 16:27:01 +0300 Kalle Valo <[email protected]> wrote:
I was surprised to see that someone was using this driver in 2015, so I'm not sure anymore what to do. Of course we could still just remove it and later revert if someone steps up and claims the driver is still usable. Hmm. Does anyone any users of this driver?
What about moving the driver over into staging, which is generally the way I understood to move a driver slowly out of the kernel?
Please don't remove random drivers. I still have the Aironet PCMCIA card and can test the driver.
Signature · 1 line
Ondrej Zary
Re: [PATCH 12/30] net: wireless: cisco: airo: Fix a myriad of coding style issues
Quoted 9 lines · Ondrej Zary
Quoted 8 lines · On Monday 17 August 2020 20:27:06 Jesse Brandeburg wrote:
Quoted 4 lines · On Mon, 17 Aug 2020 16:27:01 +0300 Kalle Valo <[email protected]> wrote:
I was surprised to see that someone was using this driver in 2015, so I'm not sure anymore what to do. Of course we could still just remove it and later revert if someone steps up and claims the driver is still usable. Hmm. Does anyone any users of this driver?
Quoted 4 lines
Quoted 2 lines
What about moving the driver over into staging, which is generally the way I understood to move a driver slowly out of the kernel?
Please don't remove random drivers.
We don't want to waste time on obsolete drivers and instead prefer to use our time on more productive tasks. For us wireless maintainers it's really hard to know if old drivers are still in use or if they are just broken.
Quoted 1 line
I still have the Aironet PCMCIA card and can test the driver.
Great. Do you know if the airo driver still works with recent kernels?
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH 12/30] net: wireless: cisco: airo: Fix a myriad of coding style issues
Quoted 16 lines · On Thursday 27 August 2020 09:49:12 Kalle Valo wrote:
Quoted 9 lines · Ondrej Zary
Quoted 8 lines · On Monday 17 August 2020 20:27:06 Jesse Brandeburg wrote:
Quoted 4 lines · On Mon, 17 Aug 2020 16:27:01 +0300 Kalle Valo <[email protected]> wrote:
I was surprised to see that someone was using this driver in 2015, so I'm not sure anymore what to do. Of course we could still just remove it and later revert if someone steps up and claims the driver is still usable. Hmm. Does anyone any users of this driver?
Quoted 4 lines
Quoted 2 lines
What about moving the driver over into staging, which is generally the way I understood to move a driver slowly out of the kernel?
Please don't remove random drivers.
Quoted 8 lines
We don't want to waste time on obsolete drivers and instead prefer to use our time on more productive tasks. For us wireless maintainers it's really hard to know if old drivers are still in use or if they are just broken.
Quoted 1 line
I still have the Aironet PCMCIA card and can test the driver.
Great. Do you know if the airo driver still works with recent kernels?
Yes, it does.
$ uname -a Linux test 5.7.0-0.bpo.2-686 #1 SMP Debian 5.7.10-1~bpo10+1 (2020-07-30) i686 GNU/Linux
# dmesg | grep airo [ 22.002273] airo(): Probing for PCI adapters [ 22.002422] airo(): Finished probing for PCI adapters [ 23.796853] airo(): cmd:111 status:7f11 rsp0:2 rsp1:0 rsp2:0 [ 23.796879] airo(): Doing fast bap_reads [ 24.021208] airo(eth1): Firmware version 5.60.22 [ 24.021238] airo(eth1): WPA supported. [ 24.021251] airo(eth1): MAC enabled xx:xx:xx:xx:xx:xx [ 24.062695] airo_cs 0.0 eth35: renamed from eth1 [ 50.308100] airo(eth35): Bad MAC enable reason=eaac, rid=e, offset=0 [ 50.332761] airo(eth35): Bad MAC enable reason=eaac, rid=e, offset=0
# wpa_supplicant -Dwext -ieth35 -c/etc/wpa_supplicant/wpa_supplicant.conf & Successfully initialized wpa_supplicant rfkill: Cannot get wiphy information ioctl[SIOCSIWENCODEEXT]: Invalid argument ioctl[SIOCSIWENCODEEXT]: Invalid argument eth35: Trying to associate with xx:xx:xx:xx:xx:xx (SSID='MSI' freq=2462 MHz) Failed to add supported operating classes IE ioctl[SIOCSIWGENIE]: Operation not supported eth35: Association request to the driver failed eth35: Associated with xx:xx:xx:xx:xx:xx eth35: CTRL-EVENT-CONNECTED - Connection to xx:xx:xx:xx:xx:xx completed [id=0 id_str=]
# dhclient -d eth35 Internet Systems Consortium DHCP Client 4.4.1 Copyright 2004-2018 Internet Systems Consortium. All rights reserved. For info, please visit https://www.isc.org/software/dhcp/
Listening on LPF/eth35/yy:yy:yy:yy:yy:yy
Sending on LPF/eth35/yy:yy:yy:yy:yy:yy
Sending on Socket/fallback
DHCPDISCOVER on eth35 to 255.255.255.255 port 67 interval 6 DHCPOFFER of 192.168.1.192 from 192.168.1.254 DHCPREQUEST for 192.168.1.192 on eth35 to 255.255.255.255 port 67 DHCPACK of 192.168.1.192 from 192.168.1.254
bound to 192.168.1.192 -- renewal in 40 seconds.
Signature · 1 line
Ondrej Zary
Re: [PATCH 12/30] net: wireless: cisco: airo: Fix a myriad of coding style issues
Quoted 22 lines · Ondrej Zary
Quoted 21 lines · On Thursday 27 August 2020 09:49:12 Kalle Valo wrote:
Quoted 9 lines · Ondrej Zary
Quoted 8 lines · On Monday 17 August 2020 20:27:06 Jesse Brandeburg wrote:
Quoted 4 lines · On Mon, 17 Aug 2020 16:27:01 +0300 Kalle Valo <[email protected]> wrote:
I was surprised to see that someone was using this driver in 2015, so I'm not sure anymore what to do. Of course we could still just remove it and later revert if someone steps up and claims the driver is still usable. Hmm. Does anyone any users of this driver?
Quoted 4 lines
Quoted 2 lines
What about moving the driver over into staging, which is generally the way I understood to move a driver slowly out of the kernel?
Please don't remove random drivers.
We don't want to waste time on obsolete drivers and instead prefer to use our time on more productive tasks. For us wireless maintainers it's really hard to know if old drivers are still in use or if they are just broken.
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
I still have the Aironet PCMCIA card and can test the driver.
Great. Do you know if the airo driver still works with recent kernels?
Yes, it does.
Nice, I'm very surprised that so old and unmaintained driver still works. Thanks for testing.
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH 12/30] net: wireless: cisco: airo: Fix a myriad of coding style issues
Quoted 24 lines · Kalle Valo
Quoted 22 lines · Ondrej Zary
Quoted 21 lines · On Thursday 27 August 2020 09:49:12 Kalle Valo wrote:
Quoted 9 lines · Ondrej Zary
Quoted 8 lines · On Monday 17 August 2020 20:27:06 Jesse Brandeburg wrote:
Quoted 4 lines · On Mon, 17 Aug 2020 16:27:01 +0300 Kalle Valo <[email protected]> wrote:
I was surprised to see that someone was using this driver in 2015, so I'm not sure anymore what to do. Of course we could still just remove it and later revert if someone steps up and claims the driver is still usable. Hmm. Does anyone any users of this driver?
Quoted 4 lines
Quoted 2 lines
What about moving the driver over into staging, which is generally the way I understood to move a driver slowly out of the kernel?
Please don't remove random drivers.
We don't want to waste time on obsolete drivers and instead prefer to use our time on more productive tasks. For us wireless maintainers it's really hard to know if old drivers are still in use or if they are just broken.
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
I still have the Aironet PCMCIA card and can test the driver.
Great. Do you know if the airo driver still works with recent kernels?
Yes, it does.
Nice, I'm very surprised that so old and unmaintained driver still works. Thanks for testing.
That's awesome. Go Linux!
So where does this leave us from a Maintainership perspective? Are you still treating the driver as obsolete? After this revelation, I suggest not. So let's make it better. :)
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 12/30] net: wireless: cisco: airo: Fix a myriad of coding style issues
Quoted 32 lines · Lee Jones
Quoted 30 lines · Kalle Valo
Quoted 27 lines · Ondrej Zary
Quoted 16 lines · On Thursday 27 August 2020 09:49:12 Kalle Valo wrote:
Quoted 9 lines · Ondrej Zary
Quoted 8 lines · On Monday 17 August 2020 20:27:06 Jesse Brandeburg wrote:
Quoted 4 lines · On Mon, 17 Aug 2020 16:27:01 +0300 Kalle Valo <[email protected]> wrote:
I was surprised to see that someone was using this driver in 2015, so I'm not sure anymore what to do. Of course we could still just remove it and later revert if someone steps up and claims the driver is still usable. Hmm. Does anyone any users of this driver?
Quoted 4 lines
Quoted 2 lines
What about moving the driver over into staging, which is generally the way I understood to move a driver slowly out of the kernel?
Please don't remove random drivers.
Quoted 8 lines
We don't want to waste time on obsolete drivers and instead prefer to use our time on more productive tasks. For us wireless maintainers it's really hard to know if old drivers are still in use or if they are just broken.
Quoted 1 line
I still have the Aironet PCMCIA card and can test the driver.
Great. Do you know if the airo driver still works with recent kernels?
Yes, it does.
Quoted 8 lines
Quoted 2 lines
Nice, I'm very surprised that so old and unmaintained driver still works. Thanks for testing.
That's awesome. Go Linux!
So where does this leave us from a Maintainership perspective? Are you still treating the driver as obsolete? After this revelation, I suggest not. So let's make it better. :)
Yeah, I can take patches to airo now. I already applied this one.
Signature · 1 line
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Re: [PATCH 12/30] net: wireless: cisco: airo: Fix a myriad of coding style issues
In reply to Kalle ValoQuoted 24 lines · On Friday 28 August 2020 10:59:37 Kalle Valo wrote:
Quoted 22 lines · Ondrej Zary
Quoted 21 lines · On Thursday 27 August 2020 09:49:12 Kalle Valo wrote:
Quoted 9 lines · Ondrej Zary
Quoted 8 lines · On Monday 17 August 2020 20:27:06 Jesse Brandeburg wrote:
Quoted 4 lines · On Mon, 17 Aug 2020 16:27:01 +0300 Kalle Valo <[email protected]> wrote:
I was surprised to see that someone was using this driver in 2015, so I'm not sure anymore what to do. Of course we could still just remove it and later revert if someone steps up and claims the driver is still usable. Hmm. Does anyone any users of this driver?
Quoted 4 lines
Quoted 2 lines
What about moving the driver over into staging, which is generally the way I understood to move a driver slowly out of the kernel?
Please don't remove random drivers.
We don't want to waste time on obsolete drivers and instead prefer to use our time on more productive tasks. For us wireless maintainers it's really hard to know if old drivers are still in use or if they are just broken.
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
I still have the Aironet PCMCIA card and can test the driver.
Great. Do you know if the airo driver still works with recent kernels?
Yes, it does.
Nice, I'm very surprised that so old and unmaintained driver still works. Thanks for testing.
Thanks to great work of all kernel maintainers most of the old drivers still work so Linux users aren't forced to throw away hardware just because it stopped working after a software update.
Signature · 1 line
Ondrej Zary
PATCH 13/30 net: wireless: ath: wil6210: cfg80211: Demote non-kerneldoc headers to standard comment blocks
In reply to Lee JonesNo effort has been made to document any of the function parameters here.
Fixes the following W=1 kernel build warning(s):
drivers/net/wireless/ath/wil6210/cfg80211.c:1749: warning: Function parameter or member 'ies' not described in '_wil_cfg80211_find_ie' drivers/net/wireless/ath/wil6210/cfg80211.c:1749: warning: Function parameter or member 'ies_len' not described in '_wil_cfg80211_find_ie' drivers/net/wireless/ath/wil6210/cfg80211.c:1749: warning: Function parameter or member 'ie' not described in '_wil_cfg80211_find_ie' drivers/net/wireless/ath/wil6210/cfg80211.c:1749: warning: Function parameter or member 'ie_len' not described in '_wil_cfg80211_find_ie' drivers/net/wireless/ath/wil6210/cfg80211.c:1780: warning: Function parameter or member 'ies1' not described in '_wil_cfg80211_merge_extra_ies' drivers/net/wireless/ath/wil6210/cfg80211.c:1780: warning: Function parameter or member 'ies1_len' not described in '_wil_cfg80211_merge_extra_ies' drivers/net/wireless/ath/wil6210/cfg80211.c:1780: warning: Function parameter or member 'ies2' not described in '_wil_cfg80211_merge_extra_ies' drivers/net/wireless/ath/wil6210/cfg80211.c:1780: warning: Function parameter or member 'ies2_len' not described in '_wil_cfg80211_merge_extra_ies' drivers/net/wireless/ath/wil6210/cfg80211.c:1780: warning: Function parameter or member 'merged_ies' not described in '_wil_cfg80211_merge_extra_ies' drivers/net/wireless/ath/wil6210/cfg80211.c:1780: warning: Function parameter or member 'merged_len' not described in '_wil_cfg80211_merge_extra_ies'
--- drivers/net/wireless/ath/wil6210/cfg80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/wil6210/cfg80211.c +2 -2
@@ -1739,7 +1739,7 @@ static int wil_cancel_remain_on_channel(struct wiphy *wiphy,return wil_p2p_cancel_listen (vif, cookie); } -/** +/* * find a specific IE in a list of IEs * return a pointer to the beginning of IE in the list * or NULL if not found
@@ -1766,7 +1766,7 @@ static const u8 *_wil_cfg80211_find_ie(const u8 *ies, u16 ies_len, const u8 *ie, ies_len); } -/** +/* * merge the IEs in two lists into a single list. * do not include IEs from the second list which exist in the first list. * add only vendor specific IEs from second list to keep
Signature · 1 line
2.25.1
PATCH 14/30 net: wireless: intel: iwlegacy: common: Remove set but not used variable 'len'
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/net/wireless/intel/iwlegacy/common.c: In function ‘il_enqueue_hcmd’:
drivers/net/wireless/intel/iwlegacy/common.c:3126:6: warning: variable ‘len’ set but not used [-Wunused-but-set-variable]
--- drivers/net/wireless/intel/iwlegacy/common.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/net/wireless/intel/iwlegacy/common.c +0 -4
@@ -3123,7 +3123,6 @@ il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd)struct il_cmd_meta *out_meta;dma_addr_t phys_addr;unsigned long flags; -int len;u32 idx;u16 fix_size;
@@ -3182,9 +3181,6 @@ il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd)cpu_to_le16 (QUEUE_TO_SEQ (il->cmd_queue) |IDX_TO_SEQ (q->write_ptr));if (cmd->flags &CMD_SIZE_HUGE ) out_cmd->hdr.sequence |=SEQ_HUGE_FRAME ; - len =sizeof (struct il_device_cmd ); -if (idx ==TFD_CMD_SLOTS ) - len =IL_MAX_CMD_SIZE ;#ifdef CONFIG_IWLEGACY_DEBUG switch (out_cmd->hdr.cmd) {
Signature · 1 line
2.25.1
PATCH 15/30 net: wireless: intel: iwlegacy: common: Demote kerneldoc headers to standard comment blocks
In reply to Lee JonesAlmost all of the headers in this file fail to reach the standards required by kernel-doc and no "kernel-doc::" references are made to it from the kernel's Documentation.
Fixes the following W=1 kernel build warning(s):
drivers/net/wireless/intel/iwlegacy/common.c: In function ‘il_enqueue_hcmd’:
drivers/net/wireless/intel/iwlegacy/common.c:3126:6: warning: variable ‘len’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/intel/iwlegacy/common.c:697: warning: Function parameter or member 'il' not described in 'il_eeprom_init' drivers/net/wireless/intel/iwlegacy/common.c:848: warning: Function parameter or member 'il' not described in 'il_mod_ht40_chan_info' drivers/net/wireless/intel/iwlegacy/common.c:848: warning: Function parameter or member 'band' not described in 'il_mod_ht40_chan_info' drivers/net/wireless/intel/iwlegacy/common.c:848: warning: Function parameter or member 'channel' not described in 'il_mod_ht40_chan_info' drivers/net/wireless/intel/iwlegacy/common.c:848: warning: Function parameter or member 'eeprom_ch' not described in 'il_mod_ht40_chan_info' drivers/net/wireless/intel/iwlegacy/common.c:848: warning: Function parameter or member 'clear_ht40_extension_channel' not described in 'il_mod_ht40_chan_info' drivers/net/wireless/intel/iwlegacy/common.c:885: warning: Function parameter or member 'il' not described in 'il_init_channel_map' drivers/net/wireless/intel/iwlegacy/common.c:1035: warning: Function parameter or member 'il' not described in 'il_get_channel_info' drivers/net/wireless/intel/iwlegacy/common.c:1035: warning: Function parameter or member 'band' not described in 'il_get_channel_info' drivers/net/wireless/intel/iwlegacy/common.c:1035: warning: Function parameter or member 'channel' not described in 'il_get_channel_info' drivers/net/wireless/intel/iwlegacy/common.c:1351: warning: Function parameter or member 'il' not described in 'il_scan_cancel' drivers/net/wireless/intel/iwlegacy/common.c:1365: warning: Function parameter or member 'il' not described in 'il_scan_cancel_timeout' drivers/net/wireless/intel/iwlegacy/common.c:1617: warning: Function parameter or member 'il' not described in 'il_fill_probe_req' drivers/net/wireless/intel/iwlegacy/common.c:1617: warning: Function parameter or member 'frame' not described in 'il_fill_probe_req' drivers/net/wireless/intel/iwlegacy/common.c:1617: warning: Function parameter or member 'ta' not described in 'il_fill_probe_req' drivers/net/wireless/intel/iwlegacy/common.c:1617: warning: Function parameter or member 'ies' not described in 'il_fill_probe_req' drivers/net/wireless/intel/iwlegacy/common.c:1617: warning: Function parameter or member 'ie_len' not described in 'il_fill_probe_req' drivers/net/wireless/intel/iwlegacy/common.c:1617: warning: Function parameter or member 'left' not described in 'il_fill_probe_req' drivers/net/wireless/intel/iwlegacy/common.c:1924: warning: Function parameter or member 'il' not described in 'il_prep_station' drivers/net/wireless/intel/iwlegacy/common.c:1924: warning: Function parameter or member 'addr' not described in 'il_prep_station' drivers/net/wireless/intel/iwlegacy/common.c:1924: warning: Function parameter or member 'is_ap' not described in 'il_prep_station' drivers/net/wireless/intel/iwlegacy/common.c:1924: warning: Function parameter or member 'sta' not described in 'il_prep_station' drivers/net/wireless/intel/iwlegacy/common.c:2009: warning: Function parameter or member 'il' not described in 'il_add_station_common' drivers/net/wireless/intel/iwlegacy/common.c:2009: warning: Function parameter or member 'addr' not described in 'il_add_station_common' drivers/net/wireless/intel/iwlegacy/common.c:2009: warning: Function parameter or member 'is_ap' not described in 'il_add_station_common' drivers/net/wireless/intel/iwlegacy/common.c:2009: warning: Function parameter or member 'sta' not described in 'il_add_station_common' drivers/net/wireless/intel/iwlegacy/common.c:2009: warning: Function parameter or member 'sta_id_r' not described in 'il_add_station_common' drivers/net/wireless/intel/iwlegacy/common.c:2070: warning: Function parameter or member 'il' not described in 'il_sta_ucode_deactivate' drivers/net/wireless/intel/iwlegacy/common.c:2070: warning: Function parameter or member 'sta_id' not described in 'il_sta_ucode_deactivate' drivers/net/wireless/intel/iwlegacy/common.c:2144: warning: Function parameter or member 'il' not described in 'il_remove_station' drivers/net/wireless/intel/iwlegacy/common.c:2144: warning: Function parameter or member 'sta_id' not described in 'il_remove_station' drivers/net/wireless/intel/iwlegacy/common.c:2144: warning: Function parameter or member 'addr' not described in 'il_remove_station' drivers/net/wireless/intel/iwlegacy/common.c:2205: warning: Function parameter or member 'il' not described in 'il_clear_ucode_stations' drivers/net/wireless/intel/iwlegacy/common.c:2237: warning: Function parameter or member 'il' not described in 'il_restore_stations' drivers/net/wireless/intel/iwlegacy/common.c:2372: warning: Function parameter or member 'il' not described in 'il_is_lq_table_valid' drivers/net/wireless/intel/iwlegacy/common.c:2372: warning: Function parameter or member 'lq' not described in 'il_is_lq_table_valid' drivers/net/wireless/intel/iwlegacy/common.c:2401: warning: Function parameter or member 'il' not described in 'il_send_lq_cmd' drivers/net/wireless/intel/iwlegacy/common.c:2401: warning: Function parameter or member 'lq' not described in 'il_send_lq_cmd' drivers/net/wireless/intel/iwlegacy/common.c:2401: warning: Function parameter or member 'flags' not described in 'il_send_lq_cmd' drivers/net/wireless/intel/iwlegacy/common.c:2539: warning: Function parameter or member 'q' not described in 'il_rx_queue_space' drivers/net/wireless/intel/iwlegacy/common.c:2556: warning: Function parameter or member 'il' not described in 'il_rx_queue_update_write_ptr' drivers/net/wireless/intel/iwlegacy/common.c:2556: warning: Function parameter or member 'q' not described in 'il_rx_queue_update_write_ptr' drivers/net/wireless/intel/iwlegacy/common.c:2711: warning: Function parameter or member 'il' not described in 'il_txq_update_write_ptr' drivers/net/wireless/intel/iwlegacy/common.c:2711: warning: Function parameter or member 'txq' not described in 'il_txq_update_write_ptr' drivers/net/wireless/intel/iwlegacy/common.c:2751: warning: Function parameter or member 'il' not described in 'il_tx_queue_unmap' drivers/net/wireless/intel/iwlegacy/common.c:2751: warning: Function parameter or member 'txq_id' not described in 'il_tx_queue_unmap' drivers/net/wireless/intel/iwlegacy/common.c:2775: warning: Function parameter or member 'il' not described in 'il_tx_queue_free' drivers/net/wireless/intel/iwlegacy/common.c:2775: warning: Function parameter or member 'txq_id' not described in 'il_tx_queue_free' drivers/net/wireless/intel/iwlegacy/common.c:2775: warning: Excess function parameter 'txq' description in 'il_tx_queue_free' drivers/net/wireless/intel/iwlegacy/common.c:2813: warning: Function parameter or member 'il' not described in 'il_cmd_queue_unmap' drivers/net/wireless/intel/iwlegacy/common.c:2856: warning: Function parameter or member 'il' not described in 'il_cmd_queue_free' drivers/net/wireless/intel/iwlegacy/common.c:2856: warning: Excess function parameter 'txq' description in 'il_cmd_queue_free' drivers/net/wireless/intel/iwlegacy/common.c:2932: warning: Function parameter or member 'il' not described in 'il_queue_init' drivers/net/wireless/intel/iwlegacy/common.c:2932: warning: Function parameter or member 'q' not described in 'il_queue_init' drivers/net/wireless/intel/iwlegacy/common.c:2932: warning: Function parameter or member 'slots' not described in 'il_queue_init' drivers/net/wireless/intel/iwlegacy/common.c:2932: warning: Function parameter or member 'id' not described in 'il_queue_init' drivers/net/wireless/intel/iwlegacy/common.c:2966: warning: Function parameter or member 'il' not described in 'il_tx_queue_alloc' drivers/net/wireless/intel/iwlegacy/common.c:2966: warning: Function parameter or member 'txq' not described in 'il_tx_queue_alloc' drivers/net/wireless/intel/iwlegacy/common.c:2966: warning: Function parameter or member 'id' not described in 'il_tx_queue_alloc' drivers/net/wireless/intel/iwlegacy/common.c:3006: warning: Function parameter or member 'il' not described in 'il_tx_queue_init' drivers/net/wireless/intel/iwlegacy/common.c:3006: warning: Function parameter or member 'txq_id' not described in 'il_tx_queue_init' drivers/net/wireless/intel/iwlegacy/common.c:3245: warning: Function parameter or member 'il' not described in 'il_hcmd_queue_reclaim' drivers/net/wireless/intel/iwlegacy/common.c:3245: warning: Function parameter or member 'txq_id' not described in 'il_hcmd_queue_reclaim' drivers/net/wireless/intel/iwlegacy/common.c:3245: warning: Function parameter or member 'idx' not described in 'il_hcmd_queue_reclaim' drivers/net/wireless/intel/iwlegacy/common.c:3245: warning: Function parameter or member 'cmd_idx' not described in 'il_hcmd_queue_reclaim' drivers/net/wireless/intel/iwlegacy/common.c:3279: warning: Function parameter or member 'il' not described in 'il_tx_cmd_complete' drivers/net/wireless/intel/iwlegacy/common.c:3425: warning: Function parameter or member 'il' not described in 'il_init_geos' drivers/net/wireless/intel/iwlegacy/common.c:3949: warning: bad line:
drivers/net/wireless/intel/iwlegacy/common.c:3955: warning: Function parameter or member 'il' not described in 'il_set_rxon_channel' drivers/net/wireless/intel/iwlegacy/common.c:4154: warning: Function parameter or member 'il' not described in 'il_irq_handle_error' drivers/net/wireless/intel/iwlegacy/common.c:5019: warning: Function parameter or member 'hw' not described in 'il_mac_config' drivers/net/wireless/intel/iwlegacy/common.c:5019: warning: Function parameter or member 'changed' not described in 'il_mac_config'
--- drivers/net/wireless/intel/iwlegacy/common.c | 68 ++++++++++---------- 1 file changed, 33 insertions(+), 35 deletions(-)
drivers/net/wireless/intel/iwlegacy/common.c +33 -35
@@ -685,7 +685,7 @@ il_eeprom_query16(const struct il_priv *il, size_t offset) }EXPORT_SYMBOL (il_eeprom_query16); -/** +/* * il_eeprom_init - read EEPROM contents * * Load the EEPROM contents from adapter into il->eeprom
@@ -836,7 +836,7 @@ il_init_band_reference(const struct il_priv *il, int eep_band,#define CHECK_AND_PRINT (x) ((eeprom_ch->flags & EEPROM_CHANNEL_##x) \ ? # x " " : "") -/** +/* * il_mod_ht40_chan_info - Copy ht40 channel info into driver's il. * * Does not set up a command, or touch hardware.
@@ -877,7 +877,7 @@ il_mod_ht40_chan_info(struct il_priv *il, enum nl80211_band band, u16 channel,#define CHECK_AND_PRINT_I (x) ((eeprom_ch_info[ch].flags & EEPROM_CHANNEL_##x) \ ? # x " " : "") -/** +/* * il_init_channel_map - Set up driver's info for all possible channels */ int
@@ -1024,7 +1024,7 @@ il_free_channel_map(struct il_priv *il) }EXPORT_SYMBOL (il_free_channel_map); -/** +/* * il_get_channel_info - Find driver's ilate channel info * * Based on band and channel number.
@@ -1343,7 +1343,7 @@ il_do_scan_abort(struct il_priv *il)D_SCAN ("Successfully send scan abort\n" ); } -/** +/* * il_scan_cancel - Cancel any currently executing HW scan */ int
@@ -1355,7 +1355,7 @@ il_scan_cancel(struct il_priv *il) }EXPORT_SYMBOL (il_scan_cancel); -/** +/* * il_scan_cancel_timeout - Cancel any currently executing HW scan * @ms: amount of time to wait (in milliseconds) for scan to abort *
@@ -1607,10 +1607,9 @@ il_bg_scan_check(struct work_struct *data)mutex_unlock (&il->mutex); } -/** +/* * il_fill_probe_req - fill in all required fields and IE for probe request */ -u16 il_fill_probe_req (struct il_priv *il,struct ieee80211_mgmt *frame,const u8 *ta,const u8 *ies,int ie_len,int left)
@@ -1913,7 +1912,7 @@ il_set_ht_add_station(struct il_priv *il, u8 idx, struct ieee80211_sta *sta)return ; } -/** +/* * il_prep_station - Prepare station information for addition * * should be called with sta_lock held
@@ -2000,7 +1999,7 @@ EXPORT_SYMBOL_GPL(il_prep_station);#define STA_WAIT_TIMEOUT (HZ/2) -/** +/* * il_add_station_common - */ int
@@ -2060,7 +2059,7 @@ il_add_station_common(struct il_priv *il, const u8 *addr, bool is_ap, }EXPORT_SYMBOL (il_add_station_common); -/** +/* * il_sta_ucode_deactivate - deactivate ucode status for a station * * il->sta_lock must be held
@@ -2136,7 +2135,7 @@ il_send_remove_station(struct il_priv *il, const u8 * addr, int sta_id,return ret; } -/** +/* * il_remove_station - Remove driver's knowledge of station. */ int
@@ -2192,7 +2191,7 @@ il_remove_station(struct il_priv *il, const u8 sta_id, const u8 * addr) }EXPORT_SYMBOL_GPL (il_remove_station); -/** +/* * il_clear_ucode_stations - clear ucode station table bits * * This function clears all the bits in the driver indicating
@@ -2224,7 +2223,7 @@ il_clear_ucode_stations(struct il_priv *il) }EXPORT_SYMBOL (il_clear_ucode_stations); -/** +/* * il_restore_stations() - Restore driver known stations to device * * All stations considered active by driver, but not present in ucode, is
@@ -2356,7 +2355,7 @@ il_dump_lq_cmd(struct il_priv *il, struct il_link_quality_cmd *lq) }#endif -/** +/* * il_is_lq_table_valid() - Test one aspect of LQ cmd for validity * * It sometimes happens when a HT rate has been in use and we
@@ -2385,7 +2384,7 @@ il_is_lq_table_valid(struct il_priv *il, struct il_link_quality_cmd *lq)return true; } -/** +/* * il_send_lq_cmd() - Send link quality command * @init: This command is sent as part of station initialization right * after station has been added.
@@ -2531,7 +2530,7 @@ EXPORT_SYMBOL(il_mac_sta_remove);* */ -/** +/* * il_rx_queue_space - Return number of free slots available in queue. */ int
@@ -2548,7 +2547,7 @@ il_rx_queue_space(const struct il_rx_queue *q) }EXPORT_SYMBOL (il_rx_queue_space); -/** +/* * il_rx_queue_update_write_ptr - Update the write pointer for the RX queue */ void
@@ -2703,7 +2702,7 @@ il_set_decrypted_flag(struct il_priv *il, struct ieee80211_hdr *hdr, }EXPORT_SYMBOL (il_set_decrypted_flag); -/** +/* * il_txq_update_write_ptr - Send new write idx to hardware */ void
@@ -2743,7 +2742,7 @@ il_txq_update_write_ptr(struct il_priv *il, struct il_tx_queue *txq) }EXPORT_SYMBOL (il_txq_update_write_ptr); -/** +/* * il_tx_queue_unmap - Unmap any remaining DMA mappings and free skb's */ void
@@ -2762,7 +2761,7 @@ il_tx_queue_unmap(struct il_priv *il, int txq_id) }EXPORT_SYMBOL (il_tx_queue_unmap); -/** +/* * il_tx_queue_free - Deallocate DMA queue. * @txq: Transmit queue to deallocate. *
@@ -2805,7 +2804,7 @@ il_tx_queue_free(struct il_priv *il, int txq_id) }EXPORT_SYMBOL (il_tx_queue_free); -/** +/* * il_cmd_queue_unmap - Unmap any remaining DMA mappings from command queue */ void
@@ -2843,9 +2842,8 @@ il_cmd_queue_unmap(struct il_priv *il) }EXPORT_SYMBOL (il_cmd_queue_unmap); -/** +/* * il_cmd_queue_free - Deallocate DMA queue. -* @txq: Transmit queue to deallocate. * * Empty queue by removing and destroying all BD's. * Free all buffers.
@@ -2924,7 +2922,7 @@ il_queue_space(const struct il_queue *q)EXPORT_SYMBOL (il_queue_space); -/** +/* * il_queue_init - Initialize queue's high/low-water and read/write idxes */ static int
@@ -2958,7 +2956,7 @@ il_queue_init(struct il_priv *il, struct il_queue *q, int slots, u32 id)return 0 ; } -/** +/* * il_tx_queue_alloc - Alloc driver data and TFD CB for one Tx/cmd queue */ static int
@@ -2998,7 +2996,7 @@ il_tx_queue_alloc(struct il_priv *il, struct il_tx_queue *txq, u32 id)return -ENOMEM ; } -/** +/* * il_tx_queue_init - Allocate and initialize one tx/cmd queue */ int
@@ -3105,7 +3103,7 @@ EXPORT_SYMBOL(il_tx_queue_reset);/*************** HOST COMMAND QUEUE FUNCTIONS *****/ -/** +/* * il_enqueue_hcmd - enqueue a uCode command * @il: device ilate data point * @cmd: a point to the ucode command structure
@@ -3229,7 +3227,7 @@ il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd)return idx; } -/** +/* * il_hcmd_queue_reclaim - Reclaim TX command queue entries already Tx'd * * When FW advances 'R' idx, all entries between old and new 'R' idx
@@ -3262,7 +3260,7 @@ il_hcmd_queue_reclaim(struct il_priv *il, int txq_id, int idx, int cmd_idx) } } -/** +/* * il_tx_cmd_complete - Pull unused buffers off the queue and reclaim them * @rxb: Rx buffer to reclaim *
@@ -3413,7 +3411,7 @@ il_init_ht_hw_capab(const struct il_priv *il, } } -/** +/* * il_init_geos - Initialize mac80211's geo/channel info based from eeprom */ int
@@ -3759,7 +3757,7 @@ il_check_rxon_cmd(struct il_priv *il) }EXPORT_SYMBOL (il_check_rxon_cmd); -/** +/* * il_full_rxon_required - check if full RXON (vs RXON_ASSOC) cmd is needed * @il: staging_rxon is compared to active_rxon *
@@ -3939,7 +3937,7 @@ il_get_single_channel_number(struct il_priv *il, enum nl80211_band band) }EXPORT_SYMBOL (il_get_single_channel_number); -/** +/* * il_set_rxon_channel - Set the band and channel values in staging RXON * @ch: requested channel as a pointer to struct ieee80211_channel
@@ -4142,7 +4140,7 @@ il_print_rx_config_cmd(struct il_priv *il) }EXPORT_SYMBOL (il_print_rx_config_cmd);#endif -/** +/* * il_irq_handle_error - called for HW or SW error interrupt from card */ void
@@ -5007,7 +5005,7 @@ il_update_qos(struct il_priv *il) &il->qos_data.def_qos_parm, NULL); } -/** +/* * il_mac_config - mac80211 config callback */ int
Signature · 1 line
2.25.1
PATCH 16/30 net: wireless: intel: ipw2200: Remove set but unused variables 'rc' and 'w'
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/net/wireless/intel/ipw2x00/ipw2200.c: In function ‘ipw_irq_tasklet’:
drivers/net/wireless/intel/ipw2x00/ipw2200.c:1953:6: warning: variable ‘rc’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/intel/ipw2x00/ipw2200.c: In function ‘ipw_rx’:
drivers/net/wireless/intel/ipw2x00/ipw2200.c:8251:9: warning: variable ‘w’ set but not used [-Wunused-but-set-variable]
--- drivers/net/wireless/intel/ipw2x00/ipw2200.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/net/wireless/intel/ipw2x00/ipw2200.c +7 -8
@@ -1950,7 +1950,6 @@ static void ipw_irq_tasklet(unsigned long data)struct ipw_priv *priv = (struct ipw_priv *)data;u32 inta, inta_mask, handled =0 ;unsigned long flags; -int rc =0 ;spin_lock_irqsave (&priv->irq_lock, flags);
@@ -1980,7 +1979,7 @@ static void ipw_irq_tasklet(unsigned long data)if (inta &IPW_INTA_BIT_TX_CMD_QUEUE ) {IPW_DEBUG_HC ("Command completed.\n" ); - rc =ipw_queue_tx_reclaim (priv, &priv->txq_cmd,-1 ); +ipw_queue_tx_reclaim (priv, &priv->txq_cmd,-1 ); priv->status &= ~STATUS_HCMD_ACTIVE ;wake_up_interruptible (&priv->wait_command_queue); handled |=IPW_INTA_BIT_TX_CMD_QUEUE ;
@@ -1988,25 +1987,25 @@ static void ipw_irq_tasklet(unsigned long data)if (inta &IPW_INTA_BIT_TX_QUEUE_1 ) {IPW_DEBUG_TX ("TX_QUEUE_1\n" ); - rc =ipw_queue_tx_reclaim (priv, &priv->txq[0 ],0 ); +ipw_queue_tx_reclaim (priv, &priv->txq[0 ],0 ); handled |=IPW_INTA_BIT_TX_QUEUE_1 ; }if (inta &IPW_INTA_BIT_TX_QUEUE_2 ) {IPW_DEBUG_TX ("TX_QUEUE_2\n" ); - rc =ipw_queue_tx_reclaim (priv, &priv->txq[1 ],1 ); +ipw_queue_tx_reclaim (priv, &priv->txq[1 ],1 ); handled |=IPW_INTA_BIT_TX_QUEUE_2 ; }if (inta &IPW_INTA_BIT_TX_QUEUE_3 ) {IPW_DEBUG_TX ("TX_QUEUE_3\n" ); - rc =ipw_queue_tx_reclaim (priv, &priv->txq[2 ],2 ); +ipw_queue_tx_reclaim (priv, &priv->txq[2 ],2 ); handled |=IPW_INTA_BIT_TX_QUEUE_3 ; }if (inta &IPW_INTA_BIT_TX_QUEUE_4 ) {IPW_DEBUG_TX ("TX_QUEUE_4\n" ); - rc =ipw_queue_tx_reclaim (priv, &priv->txq[3 ],3 ); +ipw_queue_tx_reclaim (priv, &priv->txq[3 ],3 ); handled |=IPW_INTA_BIT_TX_QUEUE_4 ; }
@@ -8248,12 +8247,12 @@ static void ipw_rx(struct ipw_priv *priv)struct ipw_rx_mem_buffer *rxb;struct ipw_rx_packet *pkt;struct libipw_hdr_4addr *header; -u32 r, w, i; +u32 r, i;u8 network_packet;u8 fill_rx =0 ; r =ipw_read32 (priv,IPW_RX_READ_INDEX ); - w =ipw_read32 (priv,IPW_RX_WRITE_INDEX ); +ipw_read32 (priv,IPW_RX_WRITE_INDEX ); i = priv->rxq->read;if (ipw_rx_queue_space (priv->rxq) > (RX_QUEUE_SIZE /2 ))
Signature · 1 line
2.25.1
PATCH 17/30 net: wireless: broadcom: b43legacy: main: Provide braces around empty 'if' body
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/net/wireless/broadcom/b43legacy/main.c: In function ?b43legacy_interrupt_tasklet?:
drivers/net/wireless/broadcom/b43legacy/main.c:1344:3: warning: suggest braces around empty body in an ?if? statement [-Wempty-body]
--- drivers/net/wireless/broadcom/b43legacy/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/b43legacy/main.c +2 -1
@@ -1340,8 +1340,9 @@ static void b43legacy_interrupt_tasklet(unsigned long data)handle_irq_beacon (dev);if (reason & B43legacy_IRQ_PMQ)handle_irq_pmq (dev); -if (reason & B43legacy_IRQ_TXFIFO_FLUSH_OK) +if (reason & B43legacy_IRQ_TXFIFO_FLUSH_OK) { ;/*TODO*/ + }if (reason & B43legacy_IRQ_NOISESAMPLE_OK)handle_irq_noise (dev);
Signature · 1 line
2.25.1
PATCH 18/30 net: fddi: skfp: hwmtm: Remove seemingly unused variable 'ID_sccs'
In reply to Lee JonesThis variable is present in many source files and has not been used anywhere (at least internally) since it was introduced.
Fixes the following W=1 kernel build warning(s):
drivers/net/fddi/skfp/hwmtm.c:14:19: warning: ‘ID_sccs’ defined but not used [-Wunused-const-variable=]
--- drivers/net/fddi/skfp/hwmtm.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/net/fddi/skfp/hwmtm.c +0 -4
@@ -10,10 +10,6 @@* ******************************************************************************/ -#ifndef lint -static char const ID_sccs[] ="@(#)hwmtm.c 1.40 99/05/31 (C) SK" ; -#endif -#define HWMTM #ifndef FDDI
Signature · 1 line
2.25.1
PATCH 19/30 net: fddi: skfp: fplustm: Remove seemingly unused variable 'ID_sccs'
In reply to Lee JonesThis variable is present in many source files and has not been used anywhere (at least internally) since it was introduced.
Fixes the following W=1 kernel build warning(s):
drivers/net/fddi/skfp/fplustm.c:25:19: warning: ‘ID_sccs’ defined but not used [-Wunused-const-variable=]
--- drivers/net/fddi/skfp/fplustm.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/net/fddi/skfp/fplustm.c +0 -4
@@ -21,10 +21,6 @@#include <linux/bitrev.h> #include <linux/etherdevice.h> -#ifndef lint -static const char ID_sccs[] ="@(#)fplustm.c 1.32 99/02/23 (C) SK " ; -#endif -#ifndef UNUSED #ifdef lint#define UNUSED (x) (x) = (x)
Signature · 1 line
2.25.1
PATCH 20/30 net: wireless: ath: ath5k: base: Fix kerneldoc formatting issue
In reply to Lee JonesKerneldoc expects attributes/parameters to be in '@*.: ' format and gets confused if the variable does not follow the type/attribute definitions.
Fixes the following W=1 kernel build warning(s):
drivers/net/wireless/ath/ath5k/base.c:1111: warning: Function parameter or member 'ah' not described in 'ath5k_drain_tx_buffs'
--- drivers/net/wireless/ath/ath5k/base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath5k/base.c +1 -1
@@ -1098,7 +1098,7 @@ ath5k_beaconq_config(struct ath5k_hw *ah)/** * ath5k_drain_tx_buffs - Empty tx buffers * -* @ah The &struct ath5k_hw +* @ah: The &struct ath5k_hw * * Empty tx buffers from all queues in preparation * of a reset or during shutdown.
Signature · 1 line
2.25.1
PATCH 21/30 net: fddi: skfp: smt: Place definition of 'smt_pdef' under same stipulations as its use
In reply to Lee JonesThe variable 'smt_pdef' is only used if LITTLE_ENDIAN is set, so only define it if this is the case.
Fixes the following W=1 kernel build warning(s):
drivers/net/fddi/skfp/smt.c:1572:3: warning: ‘smt_pdef’ defined but not used [-Wunused-const-variable=]
--- drivers/net/fddi/skfp/smt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/fddi/skfp/smt.c +2 -1
@@ -1561,7 +1561,7 @@ u_long smt_get_tid(struct s_smc *smc)return tid &0x3fffffffL ; } - +#ifdef LITTLE_ENDIAN /* * table of parameter lengths */
@@ -1641,6 +1641,7 @@ static const struct smt_pdef { } ;#define N_SMT_PLEN ARRAY_SIZE(smt_pdef) +#endif int smt_check_para (struct s_smc *smc,struct smt_header *sm,const u_short list[])
Signature · 1 line
2.25.1
PATCH 22/30 net: wireless: broadcom: brcm80211: brcmfmac: fweh: Remove set but unused variable 'err'
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c: In function ‘brcmf_fweh_handle_if_event’:
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c:131:6: warning: variable ‘err’ set but not used [-Wunused-but-set-variable]
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c +2 -3
@@ -128,7 +128,6 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr,struct brcmf_if_event *ifevent = data;struct brcmf_if *ifp;bool is_p2pdev; -int err =0 ; brcmf_dbg(EVENT, "action: %u ifidx: %u bsscfgidx: %u flags: %u role: %u\n", ifevent->action, ifevent->ifidx, ifevent->bsscfgidx,
@@ -171,8 +170,8 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr,if (ifp && ifevent->action ==BRCMF_E_IF_CHANGE )brcmf_proto_reset_if (drvr, ifp); - err =brcmf_fweh_call_event_handler (drvr, ifp, emsg->event_code, emsg, - data); +brcmf_fweh_call_event_handler (drvr, ifp, emsg->event_code, emsg, + data);if (ifp && ifevent->action ==BRCMF_E_IF_DEL ) {bool armed =brcmf_cfg80211_vif_event_armed (drvr->config);
Signature · 1 line
2.25.1
PATCH 23/30 net: wireless: broadcom: brcm80211: brcmfmac: fweh: Fix docrot related function documentation issues
In reply to Lee JonesAlso demote a commit block header which is clearly not suitable for kerneldoc.
Fixes the following W=1 kernel build warning(s):
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c: In function ‘brcmf_fweh_handle_if_event’:
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c:131:6: warning: variable ‘err’ set but not used [-Wunused-but-set-variable] drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c:36: warning: Function parameter or member 'datalen' not described in 'brcmf_fweh_queue_item' drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c:44: warning: Function parameter or member 'code' not described in 'brcmf_fweh_event_name' drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c:44: warning: Function parameter or member 'name' not described in 'brcmf_fweh_event_name' drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c:127: warning: Function parameter or member 'emsg' not described in 'brcmf_fweh_handle_if_event' drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c:127: warning: Function parameter or member 'data' not described in 'brcmf_fweh_handle_if_event' drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c:127: warning: Excess function parameter 'item' description in 'brcmf_fweh_handle_if_event' drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c:127: warning: Excess function parameter 'ifpp' description in 'brcmf_fweh_handle_if_event' drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c:391: warning: Function parameter or member 'packet_len' not described in 'brcmf_fweh_process_event'
--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c +5 -3
@@ -23,6 +23,7 @@* @ifidx: interface index related to this event. * @ifaddr: ethernet address for interface. * @emsg: common parameters of the firmware event message. +* @datalen: length of the data array * @data: event specific data part of the firmware event. */ struct brcmf_fweh_queue_item {
@@ -35,7 +36,7 @@ struct brcmf_fweh_queue_item {u8 data[]; }; -/** +/* * struct brcmf_fweh_event_name - code, name mapping entry. */ struct brcmf_fweh_event_name {
@@ -118,8 +119,8 @@ static int brcmf_fweh_call_event_handler(struct brcmf_pub *drvr,* brcmf_fweh_handle_if_event() - handle IF event. * * @drvr: driver information object. -* @item: queue entry. -* @ifpp: interface object (may change upon ADD action). +* @emsg: event message object. +* @data: event object. */ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr, struct brcmf_event_msg *emsg,
@@ -380,6 +381,7 @@ int brcmf_fweh_activate_events(struct brcmf_if *ifp)* * @drvr: driver information object. * @event_packet: event packet to process. +* @packet_len: length of the packet * * If the packet buffer contains a firmware event message it will * dispatch the event to a registered handler (using worker).
Signature · 1 line
2.25.1
PATCH 24/30 net: wireless: broadcom: brcm80211: brcmsmac: mac80211_if: Demote a few non-conformant kerneldoc headers
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
In file included from drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c:30:
drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c:288: warning: Function parameter or member 'wl' not described in 'brcms_free' drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c:1127: warning: Function parameter or member 'pdev' not described in 'brcms_attach' drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c:1222: warning: Function parameter or member 'pdev' not described in 'brcms_bcma_probe' drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c:1301: warning: Function parameter or member 'work' not described in 'brcms_driver_init'
--- .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c +5 -6
@@ -275,14 +275,13 @@ static void brcms_set_basic_rate(struct brcm_rateset *rs, u16 rate, bool is_br) } } -/** +/* * This function frees the WL per-device resources. * * This function frees resources owned by the WL device pointed to * by the wl parameter. * * precondition: can both be called locked and unlocked -* */ static void brcms_free (struct brcms_info *wl) {
@@ -1115,7 +1114,7 @@ static int ieee_hw_init(struct ieee80211_hw *hw)return ieee_hw_rate_init (hw); } -/** +/* * attach to the WL device. * * Attach to the WL device identified by vendor and device parameters.
@@ -1210,7 +1209,7 @@ static struct brcms_info *brcms_attach(struct bcma_device *pdev) -/** +/* * determines if a device is a WL device, and if so, attaches it. * * This function determines if a device pointed to by pdev is a WL device,
@@ -1290,7 +1289,7 @@ static struct bcma_driver brcms_bcma_driver = { .id_table = brcms_coreid_table, }; -/** +/* * This is the main entry point for the brcmsmac driver. * * This function is scheduled upon module initialization and
@@ -1317,7 +1316,7 @@ static int __init brcms_module_init(void)return 0 ; } -/** +/* * This function unloads the brcmsmac driver from the system. * * This function unconditionally unloads the brcmsmac driver module from the
Signature · 1 line
2.25.1
PATCH 25/30 net: wireless: intel: ipw2x00: ipw2200: Demote lots of nonconformant kerneldoc comments
In reply to Lee JonesLots of these are either completely wrong or do not even attempt to document any of the parameters. Others use an incorrect/dated format which is not recognised by the kernel (... and are also wrong and suffering from docrot).
Fixes the following W=1 kernel build warning(s):
drivers/net/wireless/intel/ipw2x00/ipw2200.c:3011: warning: Function parameter or member 'priv' not described in 'ipw_alive' drivers/net/wireless/intel/ipw2x00/ipw2200.c:3693: warning: Incorrect use of kernel-doc format: * Driver allocates buffers of this size for Rx drivers/net/wireless/intel/ipw2x00/ipw2200.c:3697: warning: Incorrect use of kernel-doc format: * ipw_rx_queue_space - Return number of free slots available in queue. drivers/net/wireless/intel/ipw2x00/ipw2200.c:3700: warning: Function parameter or member 'q' not described in 'ipw_rx_queue_space' drivers/net/wireless/intel/ipw2x00/ipw2200.c:3743: warning: Function parameter or member 'priv' not described in 'ipw_queue_init' drivers/net/wireless/intel/ipw2x00/ipw2200.c:3743: warning: Function parameter or member 'q' not described in 'ipw_queue_init' drivers/net/wireless/intel/ipw2x00/ipw2200.c:3743: warning: Function parameter or member 'count' not described in 'ipw_queue_init' drivers/net/wireless/intel/ipw2x00/ipw2200.c:3743: warning: Function parameter or member 'read' not described in 'ipw_queue_init' drivers/net/wireless/intel/ipw2x00/ipw2200.c:3743: warning: Function parameter or member 'write' not described in 'ipw_queue_init' drivers/net/wireless/intel/ipw2x00/ipw2200.c:3743: warning: Function parameter or member 'base' not described in 'ipw_queue_init' drivers/net/wireless/intel/ipw2x00/ipw2200.c:3743: warning: Function parameter or member 'size' not described in 'ipw_queue_init' drivers/net/wireless/intel/ipw2x00/ipw2200.c:3800: warning: Function parameter or member 'priv' not described in 'ipw_queue_tx_free_tfd' drivers/net/wireless/intel/ipw2x00/ipw2200.c:3800: warning: Function parameter or member 'txq' not described in 'ipw_queue_tx_free_tfd' drivers/net/wireless/intel/ipw2x00/ipw2200.c:3841: warning: Function parameter or member 'priv' not described in 'ipw_queue_tx_free' drivers/net/wireless/intel/ipw2x00/ipw2200.c:3841: warning: Function parameter or member 'txq' not described in 'ipw_queue_tx_free' drivers/net/wireless/intel/ipw2x00/ipw2200.c:3869: warning: Function parameter or member 'priv' not described in 'ipw_tx_queue_free' drivers/net/wireless/intel/ipw2x00/ipw2200.c:4474: warning: Function parameter or member 'priv' not described in 'ipw_rx_notification' drivers/net/wireless/intel/ipw2x00/ipw2200.c:4474: warning: Function parameter or member 'notif' not described in 'ipw_rx_notification' drivers/net/wireless/intel/ipw2x00/ipw2200.c:4935: warning: Function parameter or member 'priv' not described in 'ipw_queue_reset' drivers/net/wireless/intel/ipw2x00/ipw2200.c:5008: warning: Function parameter or member 'priv' not described in 'ipw_queue_tx_reclaim' drivers/net/wireless/intel/ipw2x00/ipw2200.c:5008: warning: Function parameter or member 'txq' not described in 'ipw_queue_tx_reclaim' drivers/net/wireless/intel/ipw2x00/ipw2200.c:5008: warning: Function parameter or member 'qindex' not described in 'ipw_queue_tx_reclaim' drivers/net/wireless/intel/ipw2x00/ipw2200.c:8456: warning: Function parameter or member 'priv' not described in 'ipw_sw_reset'
--- drivers/net/wireless/intel/ipw2x00/ipw2200.c | 30 ++++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/net/wireless/intel/ipw2x00/ipw2200.c +15 -15
@@ -2998,7 +2998,7 @@ static void ipw_remove_current_network(struct ipw_priv *priv)spin_unlock_irqrestore (&priv->ieee->lock, flags); } -/** +/* * Check that card is still alive. * Reads debug register from domain0. * If card is present, pre-defined value should
@@ -3113,7 +3113,7 @@ static int ipw_load_ucode(struct ipw_priv *priv, u8 * data, size_t len)mdelay (1 );/* write ucode */ -/** +/* * @bug * Do NOT set indirect address register once and then * store data to indirect data register in the loop.
@@ -3666,7 +3666,7 @@ static int ipw_load(struct ipw_priv *priv)return rc; } -/** +/* * DMA services * * Theory of operation
@@ -3689,11 +3689,11 @@ static int ipw_load(struct ipw_priv *priv)* we only utilize the first data transmit queue (queue1). */ -/** +/* * Driver allocates buffers of this size for Rx */ -/** +/* * ipw_rx_queue_space - Return number of free slots available in queue. */ static int ipw_rx_queue_space (const struct ipw_rx_queue *q)
@@ -3724,7 +3724,7 @@ static inline int ipw_queue_inc_wrap(int index, int n_bd)return (++index == n_bd) ?0 : index; } -/** +/* * Initialize common DMA queue structure * * @param q queue to init
@@ -3788,7 +3788,7 @@ static int ipw_queue_tx_init(struct ipw_priv *priv,return 0 ; } -/** +/* * Free one TFD, those at index [txq->q.last_used]. * Do NOT advance any indexes *
@@ -3811,7 +3811,7 @@ static void ipw_queue_tx_free_tfd(struct ipw_priv *priv,if (le32_to_cpu (bd->u.data.num_chunks) >NUM_TFD_CHUNKS ) {IPW_ERROR ("Too many chunks: %i\n" ,le32_to_cpu (bd->u.data.num_chunks)); -/** @todo issue fatal error, it is quite serious situation */ +/* @todo issue fatal error, it is quite serious situation */ return ; }
@@ -3828,7 +3828,7 @@ static void ipw_queue_tx_free_tfd(struct ipw_priv *priv, } } -/** +/* * Deallocate DMA queue. * * Empty queue by removing and destroying all BD's.
@@ -3860,7 +3860,7 @@ static void ipw_queue_tx_free(struct ipw_priv *priv, struct clx2_tx_queue *txq)memset (txq,0 ,sizeof (*txq)); } -/** +/* * Destroy all DMA queues and structures * * @param priv
@@ -4465,7 +4465,7 @@ static void handle_scan_event(struct ipw_priv *priv) } } -/** +/* * Handle host notification packet. * Called from interrupt routine */
@@ -4925,7 +4925,7 @@ static void ipw_rx_notification(struct ipw_priv *priv, } } -/** +/* * Destroys all DMA structures and initialise them again * * @param priv
@@ -4934,7 +4934,7 @@ static void ipw_rx_notification(struct ipw_priv *priv,static int ipw_queue_reset (struct ipw_priv *priv) {int rc =0 ; -/** @todo customize queue sizes */ +/* @todo customize queue sizes */ int nTx =64 , nTxCmd =8 ;ipw_tx_queue_free (priv);/* Tx CMD queue */
@@ -4990,7 +4990,7 @@ static int ipw_queue_reset(struct ipw_priv *priv)return rc; } -/** +/* * Reclaim Tx queue entries no more used by NIC. * * When FW advances 'R' index, all entries between old and
@@ -8445,7 +8445,7 @@ static void ipw_rx(struct ipw_priv *priv)#define DEFAULT_SHORT_RETRY_LIMIT 7U#define DEFAULT_LONG_RETRY_LIMIT 4U -/** +/* * ipw_sw_reset * @option: options to control different reset behaviour * 0 = reset everything except the 'disable' module_param
Signature · 1 line
2.25.1
PATCH 26/30 net: wireless: broadcom: b43: phy_common: Demote non-conformant kerneldoc header
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/net/wireless/broadcom/b43/phy_common.c:467: warning: Function parameter or member 'work' not described in 'b43_phy_txpower_adjust_work'
--- drivers/net/wireless/broadcom/b43/phy_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/broadcom/b43/phy_common.c +1 -1
@@ -458,7 +458,7 @@ void b43_software_rfkill(struct b43_wldev *dev, bool blocked)b43_mac_enable (dev); } -/** +/* * b43_phy_txpower_adjust_work - TX power workqueue. * * Workqueue for updating the TX power parameters in hardware.
Signature · 1 line
2.25.1
A message that is not in the archive (sent off-list or not yet received): CAJrvBf00yQQ7F1p1utBuq1oWc2RwnqXijBjaJ+FuxG0mS0TvOA@mail.gmail.com
Re: [PATCH 26/30] net: wireless: broadcom: b43: phy_common: Demote non-conformant kerneldoc header
Quoted 1 line · Artur Dubrovsky
remove me from mailing list
I guess you have to remove yourself:
http://lists.infradead.org/mailman/listinfo/b43-dev
Quoted 23 lines
??, 14 ???. 2020 ?. ? 14:43, Lee Jones <[email protected]>:
Quoted 21 lines
Fixes the following W=1 kernel build warning(s):
drivers/net/wireless/broadcom/b43/phy_common.c:467: warning: Function
parameter or member 'work' not described in 'b43_phy_txpower_adjust_work'Cc Kalle Valo <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc "Alexander A. Klimov" <[email protected]>Cc Martin Langer <[email protected]>Cc Stefano Brivio <[email protected]>Cc Michael Buesch <[email protected]>Cc van Dyk <[email protected]>Cc Andreas Jaggi <[email protected]>Cc linux-wireless at vger.kernel.orgCc b43-dev at lists.infradead.orgCc netdev at vger.kernel.orgSigned-off-by Lee Jones <[email protected]>--- drivers/net/wireless/broadcom/b43/phy_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[...]
Signature · 4 lines
Lee Jones [???] Senior Technical Lead - Developer Services Linaro.org ? Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH 26/30] net: wireless: broadcom: b43: phy_common: Demote non-conformant kerneldoc header
In reply to Lee JonesQuoted 3 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/net/wireless/broadcom/b43/phy_common.c:467: warning: Function parameter or member 'work' not described in 'b43_phy_txpower_adjust_work'
Why you can't document @work instead? Should be quite a better solution.
Re: [PATCH 26/30] net: wireless: broadcom: b43: phy_common: Demote non-conformant kerneldoc header
Quoted 6 lines · Rafa? Mi?ecki
Quoted 3 lines · Lee Jones
Fixes the following W=1 kernel build warning(s):
drivers/net/wireless/broadcom/b43/phy_common.c:467: warning: Function parameter or member 'work' not described in 'b43_phy_txpower_adjust_work'Why you can't document @work instead? Should be quite a better solution.
It some circumstances it would, but not this one.
1. This 'kernel-doc' function is not referenced from any documentation location i.e. it is presently unused and there is no reason for it to be kernel-doc in the first place.
2. This patch stops scripts/find-unused-docs.sh complaining about phy_common.c
3. 'b43_phy_txpower_adjust_work' is the only function that has been documented as kernel-doc - why is that? Seems like a mistake.
Signature · 4 lines
Lee Jones [???] Senior Technical Lead - Developer Services Linaro.org ? Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH 27/30 net: fddi: skfp: smt: Remove seemingly unused variable 'ID_sccs'
In reply to Lee JonesThis variable is present in many source files and has not been used anywhere (at least internally) since it was introduced.
Fixes the following W=1 kernel build warning(s):
drivers/net/fddi/skfp/smt.c:24:19: warning: ‘ID_sccs’ defined but not used [-Wunused-const-variable=]
--- drivers/net/fddi/skfp/smt.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/net/fddi/skfp/smt.c +0 -4
@@ -20,10 +20,6 @@#define KERNEL #include "h/smtstate.h" -#ifndef lint -static const char ID_sccs[] ="@(#)smt.c 2.43 98/11/23 (C) SK " ; -#endif -/* * FC in SMbuf */
Signature · 1 line
2.25.1
PATCH 28/30 net: fddi: skfp: cfm: Remove set but unused variable 'oldstate'
In reply to Lee JonesWhile we're at it, remove some code which has never been invoked.
Keep the comment though, as it seems potentially half useful.
Fixes the following W=1 kernel build warning(s):
drivers/net/fddi/skfp/cfm.c: In function ‘cfm’:
drivers/net/fddi/skfp/cfm.c:211:6: warning: variable ‘oldstate’ set but not used [-Wunused-but-set-variable]
--- drivers/net/fddi/skfp/cfm.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/net/fddi/skfp/cfm.c +2 -11
@@ -208,7 +208,6 @@ void cfm(struct s_smc *smc, int event) {int state ;/* remember last state */ int cond ; -int oldstate ;/* We will do the following: */ /* - compute the variable WC_Flag for every port (This is where */
@@ -222,7 +221,6 @@ void cfm(struct s_smc *smc, int event)/* - change the portstates */ cem_priv_state (smc, event); - oldstate = smc->mib.fddiSMTCF_State ; do { DB_CFM("CFM : state %s%s event %s", smc->mib.fddiSMTCF_State & AFLAG ? "ACTIONS " : "",
@@ -250,18 +248,11 @@ void cfm(struct s_smc *smc, int event)if (cond != smc->mib.fddiSMTPeerWrapFlag)smt_srf_event (smc,SMT_COND_SMT_PEER_WRAP ,0 ,cond) ; -#if 0 /* -* Don't send ever MAC_PATH_CHANGE events. Our MAC is hard-wired +* Don't ever send MAC_PATH_CHANGE events. Our MAC is hard-wired * to the primary path. */ -/* -* path change -*/ -if (smc->mib.fddiSMTCF_State != oldstate) { -smt_srf_event (smc,SMT_EVENT_MAC_PATH_CHANGE ,INDEX_MAC ,0 ) ; - } -#endif +#endif /* no SLIM_SMT */ /*
Signature · 1 line
2.25.1
PATCH 29/30 net: fddi: skfp: cfm: Remove seemingly unused variable 'ID_sccs'
In reply to Lee JonesThis variable is present in many source files and has not been used anywhere (at least internally) since it was introduced.
Fixes the following W=1 kernel build warning(s):
drivers/net/fddi/skfp/cfm.c: In function ‘cfm’:
drivers/net/fddi/skfp/cfm.c:211:6: warning: variable ‘oldstate’ set but not used [-Wunused-but-set-variable] drivers/net/fddi/skfp/cfm.c:40:19: warning: ‘ID_sccs’ defined but not used [-Wunused-const-variable=]
--- drivers/net/fddi/skfp/cfm.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/net/fddi/skfp/cfm.c +0 -4
@@ -36,10 +36,6 @@#define KERNEL #include "h/smtstate.h" -#ifndef lint -static const char ID_sccs[] ="@(#)cfm.c 2.18 98/10/06 (C) SK " ; -#endif -/* * FSM Macros */
Signature · 1 line
2.25.1
PATCH 30/30 net: wireless: broadcom: b43: phy_n: Add empty braces around empty statements
In reply to Lee JonesFixes the following W=1 kernel build warning(s):
drivers/net/wireless/broadcom/b43/phy_n.c: In function ?b43_nphy_workarounds_rev3plus?:
drivers/net/wireless/broadcom/b43/phy_n.c:3346:3: warning: suggest braces around empty body in an ?if? statement [-Wempty-body] drivers/net/wireless/broadcom/b43/phy_n.c: In function ?b43_nphy_spur_workaround?:
drivers/net/wireless/broadcom/b43/phy_n.c:4608:4: warning: suggest braces around empty body in an ?else? statement [-Wempty-body] drivers/net/wireless/broadcom/b43/phy_n.c:4641:4: warning: suggest braces around empty body in an ?else? statement [-Wempty-body] drivers/net/wireless/broadcom/b43/phy_n.c: In function ?b43_phy_initn?:
drivers/net/wireless/broadcom/b43/phy_n.c:6170:3: warning: suggest braces around empty body in an ?if? statement [-Wempty-body] drivers/net/wireless/broadcom/b43/phy_n.c:6215:5: warning: suggest braces around empty body in an ?if? statement [-Wempty-body]
--- drivers/net/wireless/broadcom/b43/phy_n.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/net/wireless/broadcom/b43/phy_n.c +12 -7
@@ -3342,8 +3342,9 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)b43_phy_write (dev,B43_NPHY_ED_CRS20UDEASSERTTHRESH0 ,0x0381 );b43_phy_write (dev,B43_NPHY_ED_CRS20UDEASSERTTHRESH1 ,0x0381 ); -if (dev->phy.rev >=6 && sprom->boardflags2_lo &B43_BFL2_SINGLEANT_CCK ) +if (dev->phy.rev >=6 && sprom->boardflags2_lo &B43_BFL2_SINGLEANT_CCK ) { ;/* TODO: 0x0080000000000000 HF */ + } }static void b43_nphy_workarounds_rev1_2 (struct b43_wldev *dev)
@@ -4602,10 +4603,11 @@ static void b43_nphy_spur_workaround(struct b43_wldev *dev)if (nphy->gband_spurwar_en) {/* TODO: N PHY Adjust Analog Pfbw (7) */ -if (channel ==11 &&b43_is_40mhz (dev)) +if (channel ==11 &&b43_is_40mhz (dev)) { ;/* TODO: N PHY Adjust Min Noise Var(2, tone, noise)*/ -else + }else { ;/* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/ + }/* TODO: N PHY Adjust CRS Min Power (0x1E) */ }
@@ -4635,10 +4637,11 @@ static void b43_nphy_spur_workaround(struct b43_wldev *dev) noise[0 ] =0 ; } -if (!tone[0 ] && !noise[0 ]) +if (!tone[0 ] && !noise[0 ]) { ;/* TODO: N PHY Adjust Min Noise Var(1, tone, noise)*/ -else + }else { ;/* TODO: N PHY Adjust Min Noise Var(0, NULL, NULL)*/ + } }if (nphy->hang_avoid)
@@ -6166,8 +6169,9 @@ static int b43_phy_initn(struct b43_wldev *dev)if (nphy->phyrxchain !=3 )b43_nphy_set_rx_core_state (dev, nphy->phyrxchain); -if (nphy->mphase_cal_phase_id >0 ) +if (nphy->mphase_cal_phase_id >0 ) { ;/* TODO PHY Periodic Calibration Multi-Phase Restart */ + } do_rssi_cal = false;if (phy->rev >=3 ) {
@@ -6211,8 +6215,9 @@ static int b43_phy_initn(struct b43_wldev *dev)if (!b43_nphy_cal_tx_iq_lo (dev, target, true, false))if (b43_nphy_cal_rx_iq (dev, target,2 ,0 ) ==0 )b43_nphy_save_cal (dev); - }else if (nphy->mphase_cal_phase_id ==0 ) + }else if (nphy->mphase_cal_phase_id ==0 ) { ;/* N PHY Periodic Calibration with arg 3 */ + } }else {b43_nphy_restore_cal (dev); }
Signature · 1 line
2.25.1
From: Lee Jones <[email protected]>
Date: Fri, 14 Aug 2020 12:39:03 +0100
Quoted 8 lines
This set is part of a larger effort attempting to clean-up W=1 kernel builds, which are currently overwhelmingly riddled with niggly little warnings.
There are quite a few W=1 warnings in the Networking code. My plan is to work through all of them over the next few weeks. Hopefully it won't be too long before
drivers/netbuilds clean with W=1 enabled.
I applied the non-wireless changes here to my tree.
Thanks.
Quoted 7 lines · David Miller
From: Lee Jones <[email protected]>
Date: Fri, 14 Aug 2020 12:39:03 +0100Quoted 4 lines
This set is part of a larger effort attempting to clean-up W=1 kernel builds, which are currently overwhelmingly riddled with niggly little warnings.
Quoted 6 lines
Quoted 4 lines
There are quite a few W=1 warnings in the Networking code. My plan is to work through all of them over the next few weeks. Hopefully it won't be too long before
drivers/netbuilds clean with W=1 enabled.I applied the non-wireless changes here to my tree.
Thanks Dave, that's great.
Are there any more sub-groups that I need to be aware of, besides wireless? Or can everything else be grouped together?
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
David Miller
maintainerFrom: Lee Jones <[email protected]>
Date: Mon, 17 Aug 2020 10:26:11 +0100
Quoted 2 lines
Are there any more sub-groups that I need to be aware of, besides wireless? Or can everything else be grouped together?
Netfilter, mac802154, usually the Intel and Mellanox driver maintainers take things in directly then send pull request to me...
There are probably several other examples.
Quoted 10 lines · David Miller
From: Lee Jones <[email protected]>
Date: Mon, 17 Aug 2020 10:26:11 +0100Quoted 2 lines
Are there any more sub-groups that I need to be aware of, besides wireless? Or can everything else be grouped together?
Netfilter, mac802154, usually the Intel and Mellanox driver maintainers take things in directly then send pull request to me...
There are probably several other examples.
Okay, I'll bear that in mind. Thanks.
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 8 lines · Kalle Valo
+ linux-wireless
Quoted 4 lines · Lee Jones
This set is part of a larger effort attempting to clean-up W=1 kernel builds, which are currently overwhelmingly riddled with niggly little warnings.
Quoted 7 lines
Quoted 4 lines
There are quite a few W=1 warnings in the Networking code. My plan is to work through all of them over the next few weeks. Hopefully it won't be too long before
drivers/netbuilds clean with W=1 enabled.In the future please send wireless patches in a separate patchset and cc linux-wireless. That way it's easier for me and Dave.
Oh, I see. I didn't realise it was maintained as it's own entity.
Will keep the separate in the future, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog