Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
ddc9f824
Commit
ddc9f824
authored
Apr 29, 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
ac7c992c
c428c892
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
18 deletions
+23
-18
drivers/net/wireless/ath5k/debug.c
drivers/net/wireless/ath5k/debug.c
+1
-1
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/iwlwifi/iwl-scan.c
+2
-2
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
+0
-1
drivers/net/wireless/rndis_wlan.c
drivers/net/wireless/rndis_wlan.c
+10
-4
net/mac80211/main.c
net/mac80211/main.c
+10
-10
No files found.
drivers/net/wireless/ath5k/debug.c
View file @
ddc9f824
...
...
@@ -424,7 +424,7 @@ ath5k_debug_dump_bands(struct ath5k_softc *sc)
for
(
b
=
0
;
b
<
IEEE80211_NUM_BANDS
;
b
++
)
{
struct
ieee80211_supported_band
*
band
=
&
sc
->
sbands
[
b
];
char
bname
[
5
];
char
bname
[
6
];
switch
(
band
->
band
)
{
case
IEEE80211_BAND_2GHZ
:
strcpy
(
bname
,
"2 GHz"
);
...
...
drivers/net/wireless/iwlwifi/iwl-scan.c
View file @
ddc9f824
...
...
@@ -925,11 +925,11 @@ void iwl_bg_scan_completed(struct work_struct *work)
IWL_DEBUG_SCAN
(
priv
,
"SCAN complete scan
\n
"
);
ieee80211_scan_completed
(
priv
->
hw
,
false
);
if
(
test_bit
(
STATUS_EXIT_PENDING
,
&
priv
->
status
))
return
;
ieee80211_scan_completed
(
priv
->
hw
,
false
);
/* Since setting the TXPOWER may have been deferred while
* performing the scan, fire one off */
mutex_lock
(
&
priv
->
mutex
);
...
...
drivers/net/wireless/iwlwifi/iwl3945-base.c
View file @
ddc9f824
...
...
@@ -1694,7 +1694,6 @@ void iwl3945_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
rxq
->
free_count
=
0
;
spin_unlock_irqrestore
(
&
rxq
->
lock
,
flags
);
}
EXPORT_SYMBOL
(
iwl3945_rx_queue_reset
);
/*
* this should be called while priv->lock is locked
...
...
drivers/net/wireless/rndis_wlan.c
View file @
ddc9f824
...
...
@@ -2558,6 +2558,11 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf)
mutex_init
(
&
priv
->
command_lock
);
spin_lock_init
(
&
priv
->
stats_lock
);
/* because rndis_command() sleeps we need to use workqueue */
priv
->
workqueue
=
create_singlethread_workqueue
(
"rndis_wlan"
);
INIT_WORK
(
&
priv
->
work
,
rndis_wext_worker
);
INIT_DELAYED_WORK
(
&
priv
->
stats_work
,
rndis_update_wireless_stats
);
/* try bind rndis_host */
retval
=
generic_rndis_bind
(
usbdev
,
intf
,
FLAG_RNDIS_PHYM_WIRELESS
);
if
(
retval
<
0
)
...
...
@@ -2603,16 +2608,17 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf)
disassociate
(
usbdev
,
1
);
netif_carrier_off
(
usbdev
->
net
);
/* because rndis_command() sleeps we need to use workqueue */
priv
->
workqueue
=
create_singlethread_workqueue
(
"rndis_wlan"
);
INIT_DELAYED_WORK
(
&
priv
->
stats_work
,
rndis_update_wireless_stats
);
queue_delayed_work
(
priv
->
workqueue
,
&
priv
->
stats_work
,
round_jiffies_relative
(
STATS_UPDATE_JIFFIES
));
INIT_WORK
(
&
priv
->
work
,
rndis_wext_worker
);
return
0
;
fail:
cancel_delayed_work_sync
(
&
priv
->
stats_work
);
cancel_work_sync
(
&
priv
->
work
);
flush_workqueue
(
priv
->
workqueue
);
destroy_workqueue
(
priv
->
workqueue
);
kfree
(
priv
);
return
retval
;
}
...
...
net/mac80211/main.c
View file @
ddc9f824
...
...
@@ -757,6 +757,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
local
->
hw
.
conf
.
long_frame_max_tx_count
=
4
;
local
->
hw
.
conf
.
short_frame_max_tx_count
=
7
;
local
->
hw
.
conf
.
radio_enabled
=
true
;
local
->
user_power_level
=
-
1
;
INIT_LIST_HEAD
(
&
local
->
interfaces
);
mutex_init
(
&
local
->
iflist_mtx
);
...
...
@@ -909,6 +910,13 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
if
(
result
<
0
)
goto
fail_sta_info
;
result
=
ieee80211_wep_init
(
local
);
if
(
result
<
0
)
{
printk
(
KERN_DEBUG
"%s: Failed to initialize wep: %d
\n
"
,
wiphy_name
(
local
->
hw
.
wiphy
),
result
);
goto
fail_wep
;
}
rtnl_lock
();
result
=
dev_alloc_name
(
local
->
mdev
,
local
->
mdev
->
name
);
if
(
result
<
0
)
...
...
@@ -930,14 +938,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
goto
fail_rate
;
}
result
=
ieee80211_wep_init
(
local
);
if
(
result
<
0
)
{
printk
(
KERN_DEBUG
"%s: Failed to initialize wep: %d
\n
"
,
wiphy_name
(
local
->
hw
.
wiphy
),
result
);
goto
fail_wep
;
}
/* add one default STA interface if supported */
if
(
local
->
hw
.
wiphy
->
interface_modes
&
BIT
(
NL80211_IFTYPE_STATION
))
{
result
=
ieee80211_if_add
(
local
,
"wlan%d"
,
NULL
,
...
...
@@ -967,13 +967,13 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
return
0
;
fail_wep:
rate_control_deinitialize
(
local
);
fail_rate:
unregister_netdevice
(
local
->
mdev
);
local
->
mdev
=
NULL
;
fail_dev:
rtnl_unlock
();
ieee80211_wep_free
(
local
);
fail_wep:
sta_info_stop
(
local
);
fail_sta_info:
debugfs_hw_del
(
local
);
...
...
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