Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
775d8d93
Commit
775d8d93
authored
Apr 20, 2009
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
parents
62cedd11
7e0986c1
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
107 additions
and
70 deletions
+107
-70
drivers/net/wireless/ar9170/usb.c
drivers/net/wireless/ar9170/usb.c
+90
-20
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
+1
-1
drivers/net/wireless/mwl8k.c
drivers/net/wireless/mwl8k.c
+2
-2
drivers/net/wireless/p54/p54common.c
drivers/net/wireless/p54/p54common.c
+0
-2
drivers/net/wireless/rt2x00/rt2x00pci.c
drivers/net/wireless/rt2x00/rt2x00pci.c
+1
-17
drivers/net/wireless/rt2x00/rt2x00usb.c
drivers/net/wireless/rt2x00/rt2x00usb.c
+1
-17
net/mac80211/Kconfig
net/mac80211/Kconfig
+0
-7
net/mac80211/mlme.c
net/mac80211/mlme.c
+10
-2
net/wireless/nl80211.c
net/wireless/nl80211.c
+2
-2
No files found.
drivers/net/wireless/ar9170/usb.c
View file @
775d8d93
...
...
@@ -623,6 +623,39 @@ static int ar9170_usb_open(struct ar9170 *ar)
return
0
;
}
static
int
ar9170_usb_init_device
(
struct
ar9170_usb
*
aru
)
{
int
err
;
err
=
ar9170_usb_alloc_rx_irq_urb
(
aru
);
if
(
err
)
goto
err_out
;
err
=
ar9170_usb_alloc_rx_bulk_urbs
(
aru
);
if
(
err
)
goto
err_unrx
;
err
=
ar9170_usb_upload_firmware
(
aru
);
if
(
err
)
{
err
=
ar9170_echo_test
(
&
aru
->
common
,
0x60d43110
);
if
(
err
)
{
/* force user invention, by disabling the device */
err
=
usb_driver_set_configuration
(
aru
->
udev
,
-
1
);
dev_err
(
&
aru
->
udev
->
dev
,
"device is in a bad state. "
"please reconnect it!
\n
"
);
goto
err_unrx
;
}
}
return
0
;
err_unrx:
ar9170_usb_cancel_urbs
(
aru
);
err_out:
return
err
;
}
static
int
ar9170_usb_probe
(
struct
usb_interface
*
intf
,
const
struct
usb_device_id
*
id
)
{
...
...
@@ -658,32 +691,16 @@ static int ar9170_usb_probe(struct usb_interface *intf,
err
=
ar9170_usb_reset
(
aru
);
if
(
err
)
goto
err_
unlock
;
goto
err_
freehw
;
err
=
ar9170_usb_request_firmware
(
aru
);
if
(
err
)
goto
err_
unlock
;
goto
err_
freehw
;
err
=
ar9170_usb_
alloc_rx_irq_urb
(
aru
);
err
=
ar9170_usb_
init_device
(
aru
);
if
(
err
)
goto
err_freefw
;
err
=
ar9170_usb_alloc_rx_bulk_urbs
(
aru
);
if
(
err
)
goto
err_unrx
;
err
=
ar9170_usb_upload_firmware
(
aru
);
if
(
err
)
{
err
=
ar9170_echo_test
(
&
aru
->
common
,
0x60d43110
);
if
(
err
)
{
/* force user invention, by disabling the device */
err
=
usb_driver_set_configuration
(
aru
->
udev
,
-
1
);
dev_err
(
&
aru
->
udev
->
dev
,
"device is in a bad state. "
"please reconnect it!
\n
"
);
goto
err_unrx
;
}
}
err
=
ar9170_usb_open
(
ar
);
if
(
err
)
goto
err_unrx
;
...
...
@@ -703,7 +720,7 @@ static int ar9170_usb_probe(struct usb_interface *intf,
release_firmware
(
aru
->
init_values
);
release_firmware
(
aru
->
firmware
);
err_
unlock
:
err_
freehw
:
usb_set_intfdata
(
intf
,
NULL
);
usb_put_dev
(
udev
);
ieee80211_free_hw
(
ar
->
hw
);
...
...
@@ -730,12 +747,65 @@ static void ar9170_usb_disconnect(struct usb_interface *intf)
ieee80211_free_hw
(
aru
->
common
.
hw
);
}
#ifdef CONFIG_PM
static
int
ar9170_suspend
(
struct
usb_interface
*
intf
,
pm_message_t
message
)
{
struct
ar9170_usb
*
aru
=
usb_get_intfdata
(
intf
);
if
(
!
aru
)
return
-
ENODEV
;
aru
->
common
.
state
=
AR9170_IDLE
;
ar9170_usb_cancel_urbs
(
aru
);
return
0
;
}
static
int
ar9170_resume
(
struct
usb_interface
*
intf
)
{
struct
ar9170_usb
*
aru
=
usb_get_intfdata
(
intf
);
int
err
;
if
(
!
aru
)
return
-
ENODEV
;
usb_unpoison_anchored_urbs
(
&
aru
->
rx_submitted
);
usb_unpoison_anchored_urbs
(
&
aru
->
tx_submitted
);
/*
* FIXME: firmware upload will fail on resume.
* but this is better than a hang!
*/
err
=
ar9170_usb_init_device
(
aru
);
if
(
err
)
goto
err_unrx
;
err
=
ar9170_usb_open
(
&
aru
->
common
);
if
(
err
)
goto
err_unrx
;
return
0
;
err_unrx:
aru
->
common
.
state
=
AR9170_IDLE
;
ar9170_usb_cancel_urbs
(
aru
);
return
err
;
}
#endif
/* CONFIG_PM */
static
struct
usb_driver
ar9170_driver
=
{
.
name
=
"ar9170usb"
,
.
probe
=
ar9170_usb_probe
,
.
disconnect
=
ar9170_usb_disconnect
,
.
id_table
=
ar9170_usb_ids
,
.
soft_unbind
=
1
,
#ifdef CONFIG_PM
.
suspend
=
ar9170_suspend
,
.
resume
=
ar9170_resume
,
#endif
/* CONFIG_PM */
};
static
int
__init
ar9170_init
(
void
)
...
...
drivers/net/wireless/iwlwifi/iwl3945-base.c
View file @
775d8d93
...
...
@@ -4075,7 +4075,7 @@ static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
if
(
!
static_key
)
{
sta_id
=
iwl3945_hw_find_station
(
priv
,
addr
);
if
(
sta_id
==
IWL_INVALID_STATION
)
{
IWL_DEBUG_MAC80211
(
priv
,
"leave - %pMnot in station map.
\n
"
,
IWL_DEBUG_MAC80211
(
priv
,
"leave - %pM
not in station map.
\n
"
,
addr
);
return
-
EINVAL
;
}
...
...
drivers/net/wireless/mwl8k.c
View file @
775d8d93
...
...
@@ -3720,12 +3720,12 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
return
rc
;
}
static
void
__devexit
mwl8k_
remove
(
struct
pci_dev
*
pdev
)
static
void
__devexit
mwl8k_
shutdown
(
struct
pci_dev
*
pdev
)
{
printk
(
KERN_ERR
"===>%s(%u)
\n
"
,
__func__
,
__LINE__
);
}
static
void
__devexit
mwl8k_
shutdown
(
struct
pci_dev
*
pdev
)
static
void
__devexit
mwl8k_
remove
(
struct
pci_dev
*
pdev
)
{
struct
ieee80211_hw
*
hw
=
pci_get_drvdata
(
pdev
);
struct
mwl8k_priv
*
priv
;
...
...
drivers/net/wireless/p54/p54common.c
View file @
775d8d93
...
...
@@ -2543,8 +2543,6 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
priv
->
basic_rate_mask
=
0x15f
;
skb_queue_head_init
(
&
priv
->
tx_queue
);
dev
->
flags
=
IEEE80211_HW_RX_INCLUDES_FCS
|
IEEE80211_HW_SUPPORTS_PS
|
IEEE80211_HW_PS_NULLFUNC_STACK
|
IEEE80211_HW_SIGNAL_DBM
|
IEEE80211_HW_NOISE_DBM
;
...
...
drivers/net/wireless/rt2x00/rt2x00pci.c
View file @
775d8d93
...
...
@@ -369,8 +369,6 @@ int rt2x00pci_suspend(struct pci_dev *pci_dev, pm_message_t state)
if
(
retval
)
return
retval
;
rt2x00pci_free_reg
(
rt2x00dev
);
pci_save_state
(
pci_dev
);
pci_disable_device
(
pci_dev
);
return
pci_set_power_state
(
pci_dev
,
pci_choose_state
(
pci_dev
,
state
));
...
...
@@ -381,7 +379,6 @@ int rt2x00pci_resume(struct pci_dev *pci_dev)
{
struct
ieee80211_hw
*
hw
=
pci_get_drvdata
(
pci_dev
);
struct
rt2x00_dev
*
rt2x00dev
=
hw
->
priv
;
int
retval
;
if
(
pci_set_power_state
(
pci_dev
,
PCI_D0
)
||
pci_enable_device
(
pci_dev
)
||
...
...
@@ -390,20 +387,7 @@ int rt2x00pci_resume(struct pci_dev *pci_dev)
return
-
EIO
;
}
retval
=
rt2x00pci_alloc_reg
(
rt2x00dev
);
if
(
retval
)
return
retval
;
retval
=
rt2x00lib_resume
(
rt2x00dev
);
if
(
retval
)
goto
exit_free_reg
;
return
0
;
exit_free_reg:
rt2x00pci_free_reg
(
rt2x00dev
);
return
retval
;
return
rt2x00lib_resume
(
rt2x00dev
);
}
EXPORT_SYMBOL_GPL
(
rt2x00pci_resume
);
#endif
/* CONFIG_PM */
...
...
drivers/net/wireless/rt2x00/rt2x00usb.c
View file @
775d8d93
...
...
@@ -702,8 +702,6 @@ int rt2x00usb_suspend(struct usb_interface *usb_intf, pm_message_t state)
if
(
retval
)
return
retval
;
rt2x00usb_free_reg
(
rt2x00dev
);
/*
* Decrease usbdev refcount.
*/
...
...
@@ -717,24 +715,10 @@ int rt2x00usb_resume(struct usb_interface *usb_intf)
{
struct
ieee80211_hw
*
hw
=
usb_get_intfdata
(
usb_intf
);
struct
rt2x00_dev
*
rt2x00dev
=
hw
->
priv
;
int
retval
;
usb_get_dev
(
interface_to_usbdev
(
usb_intf
));
retval
=
rt2x00usb_alloc_reg
(
rt2x00dev
);
if
(
retval
)
return
retval
;
retval
=
rt2x00lib_resume
(
rt2x00dev
);
if
(
retval
)
goto
exit_free_reg
;
return
0
;
exit_free_reg:
rt2x00usb_free_reg
(
rt2x00dev
);
return
retval
;
return
rt2x00lib_resume
(
rt2x00dev
);
}
EXPORT_SYMBOL_GPL
(
rt2x00usb_resume
);
#endif
/* CONFIG_PM */
...
...
net/mac80211/Kconfig
View file @
775d8d93
...
...
@@ -202,10 +202,3 @@ config MAC80211_DEBUG_COUNTERS
and show them in debugfs.
If unsure, say N.
config MAC80211_VERBOSE_SPECT_MGMT_DEBUG
bool "Verbose Spectrum Management (IEEE 802.11h)debugging"
depends on MAC80211_DEBUG_MENU
---help---
Say Y here to print out verbose Spectrum Management (IEEE 802.11h)
debug messages.
net/mac80211/mlme.c
View file @
775d8d93
...
...
@@ -1366,7 +1366,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
for
(
i
=
0
;
i
<
elems
.
ext_supp_rates_len
;
i
++
)
{
int
rate
=
(
elems
.
ext_supp_rates
[
i
]
&
0x7f
)
*
5
;
bool
is_basic
=
!!
(
elems
.
supp_rates
[
i
]
&
0x80
);
bool
is_basic
=
!!
(
elems
.
ext_
supp_rates
[
i
]
&
0x80
);
if
(
rate
>
110
)
have_higher_than_11mbit
=
true
;
...
...
@@ -1913,9 +1913,17 @@ static void ieee80211_sta_work(struct work_struct *work)
static
void
ieee80211_restart_sta_timer
(
struct
ieee80211_sub_if_data
*
sdata
)
{
if
(
sdata
->
vif
.
type
==
NL80211_IFTYPE_STATION
)
if
(
sdata
->
vif
.
type
==
NL80211_IFTYPE_STATION
)
{
/*
* Need to update last_beacon to avoid beacon loss
* test to trigger.
*/
sdata
->
u
.
mgd
.
last_beacon
=
jiffies
;
queue_work
(
sdata
->
local
->
hw
.
workqueue
,
&
sdata
->
u
.
mgd
.
work
);
}
}
/* interface setup */
...
...
net/wireless/nl80211.c
View file @
775d8d93
...
...
@@ -3334,7 +3334,7 @@ static void nl80211_send_mlme_event(struct cfg80211_registered_device *rdev,
struct
sk_buff
*
msg
;
void
*
hdr
;
msg
=
nlmsg_new
(
NLMSG_GOODSIZE
,
GFP_
KERNEL
);
msg
=
nlmsg_new
(
NLMSG_GOODSIZE
,
GFP_
ATOMIC
);
if
(
!
msg
)
return
;
...
...
@@ -3353,7 +3353,7 @@ static void nl80211_send_mlme_event(struct cfg80211_registered_device *rdev,
return
;
}
genlmsg_multicast
(
msg
,
0
,
nl80211_mlme_mcgrp
.
id
,
GFP_
KERNEL
);
genlmsg_multicast
(
msg
,
0
,
nl80211_mlme_mcgrp
.
id
,
GFP_
ATOMIC
);
return
;
nla_put_failure:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment