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
e8573758
Commit
e8573758
authored
May 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
4e0168fa
aeeab4ff
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
drivers/net/wireless/Kconfig
drivers/net/wireless/Kconfig
+1
-0
drivers/net/wireless/at76c50x-usb.c
drivers/net/wireless/at76c50x-usb.c
+6
-6
drivers/net/wireless/rtl818x/rtl8187_dev.c
drivers/net/wireless/rtl818x/rtl8187_dev.c
+2
-0
No files found.
drivers/net/wireless/Kconfig
View file @
e8573758
...
...
@@ -430,6 +430,7 @@ config RTL8187
ASUS P5B Deluxe
Toshiba Satellite Pro series of laptops
Asus Wireless Link
Linksys WUSB54GC-EU
Thanks to Realtek for their support!
...
...
drivers/net/wireless/at76c50x-usb.c
View file @
e8573758
...
...
@@ -1873,18 +1873,18 @@ static void at76_dwork_hw_scan(struct work_struct *work)
if
(
ret
!=
CMD_STATUS_COMPLETE
)
{
queue_delayed_work
(
priv
->
hw
->
workqueue
,
&
priv
->
dwork_hw_scan
,
SCAN_POLL_INTERVAL
);
goto
exit
;
mutex_unlock
(
&
priv
->
mtx
);
return
;
}
ieee80211_scan_completed
(
priv
->
hw
,
false
);
if
(
is_valid_ether_addr
(
priv
->
bssid
))
at76_join
(
priv
);
ieee80211_wake_queues
(
priv
->
hw
);
exit:
mutex_unlock
(
&
priv
->
mtx
);
ieee80211_scan_completed
(
priv
->
hw
,
false
);
ieee80211_wake_queues
(
priv
->
hw
);
}
static
int
at76_hw_scan
(
struct
ieee80211_hw
*
hw
,
...
...
drivers/net/wireless/rtl818x/rtl8187_dev.c
View file @
e8573758
...
...
@@ -71,6 +71,8 @@ static struct usb_device_id rtl8187_table[] __devinitdata = {
{
USB_DEVICE
(
0x18E8
,
0x6232
),
.
driver_info
=
DEVICE_RTL8187
},
/* AirLive */
{
USB_DEVICE
(
0x1b75
,
0x8187
),
.
driver_info
=
DEVICE_RTL8187
},
/* Linksys */
{
USB_DEVICE
(
0x1737
,
0x0073
),
.
driver_info
=
DEVICE_RTL8187B
},
{}
};
...
...
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