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
fc4d30a6
Commit
fc4d30a6
authored
Mar 17, 2008
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
9150c979
1682fe6d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
127 additions
and
81 deletions
+127
-81
drivers/net/ps3_gelic_wireless.c
drivers/net/ps3_gelic_wireless.c
+17
-12
drivers/net/wireless/ath5k/hw.c
drivers/net/wireless/ath5k/hw.c
+2
-0
drivers/net/wireless/b43/phy.c
drivers/net/wireless/b43/phy.c
+1
-1
drivers/net/wireless/p54usb.c
drivers/net/wireless/p54usb.c
+1
-0
drivers/net/wireless/rt2x00/rt2x00.h
drivers/net/wireless/rt2x00/rt2x00.h
+3
-0
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00dev.c
+14
-21
drivers/net/wireless/rt2x00/rt2x00lib.h
drivers/net/wireless/rt2x00/rt2x00lib.h
+14
-6
drivers/net/wireless/rt2x00/rt2x00rfkill.c
drivers/net/wireless/rt2x00/rt2x00rfkill.c
+75
-41
No files found.
drivers/net/ps3_gelic_wireless.c
View file @
fc4d30a6
...
...
@@ -1644,13 +1644,24 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
}
/* put them in the newtork_list */
scan_info
=
wl
->
buf
;
scan_info_size
=
0
;
i
=
0
;
while
(
scan_info_size
<
data_len
)
{
for
(
i
=
0
,
scan_info_size
=
0
,
scan_info
=
wl
->
buf
;
scan_info_size
<
data_len
;
i
++
,
scan_info_size
+=
be16_to_cpu
(
scan_info
->
size
),
scan_info
=
(
void
*
)
scan_info
+
be16_to_cpu
(
scan_info
->
size
)
)
{
pr_debug
(
"%s:size=%d bssid=%s scan_info=%p
\n
"
,
__func__
,
be16_to_cpu
(
scan_info
->
size
),
print_mac
(
mac
,
&
scan_info
->
bssid
[
2
]),
scan_info
);
/*
* The wireless firmware may return invalid channel 0 and/or
* invalid rate if the AP emits zero length SSID ie. As this
* scan information is useless, ignore it
*/
if
(
!
be16_to_cpu
(
scan_info
->
channel
)
||
!
scan_info
->
rate
[
0
])
{
pr_debug
(
"%s: invalid scan info
\n
"
,
__func__
);
continue
;
}
found
=
0
;
oldest
=
NULL
;
list_for_each_entry
(
target
,
&
wl
->
network_list
,
list
)
{
...
...
@@ -1687,10 +1698,6 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
GFP_KERNEL
);
if
(
!
target
->
hwinfo
)
{
pr_info
(
"%s: kzalloc failed
\n
"
,
__func__
);
i
++
;
scan_info_size
+=
be16_to_cpu
(
scan_info
->
size
);
scan_info
=
(
void
*
)
scan_info
+
be16_to_cpu
(
scan_info
->
size
);
continue
;
}
/* copy hw scan info */
...
...
@@ -1709,10 +1716,6 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
if
(
scan_info
->
ext_rate
[
r
])
target
->
rate_ext_len
++
;
list_move_tail
(
&
target
->
list
,
&
wl
->
network_list
);
/* bump pointer */
i
++
;
scan_info_size
+=
be16_to_cpu
(
scan_info
->
size
);
scan_info
=
(
void
*
)
scan_info
+
be16_to_cpu
(
scan_info
->
size
);
}
memset
(
&
data
,
0
,
sizeof
(
data
));
wireless_send_event
(
port_to_netdev
(
wl_port
(
wl
)),
SIOCGIWSCAN
,
&
data
,
...
...
@@ -2389,6 +2392,8 @@ static struct net_device *gelic_wl_alloc(struct gelic_card *card)
if
(
!
netdev
)
return
NULL
;
strcpy
(
netdev
->
name
,
"wlan%d"
);
port
=
netdev_priv
(
netdev
);
port
->
netdev
=
netdev
;
port
->
card
=
card
;
...
...
drivers/net/wireless/ath5k/hw.c
View file @
fc4d30a6
...
...
@@ -427,6 +427,8 @@ void ath5k_hw_detach(struct ath5k_hw *ah)
{
ATH5K_TRACE
(
ah
->
ah_sc
);
__set_bit
(
ATH_STAT_INVALID
,
ah
->
ah_sc
->
status
);
if
(
ah
->
ah_rf_banks
!=
NULL
)
kfree
(
ah
->
ah_rf_banks
);
...
...
drivers/net/wireless/b43/phy.c
View file @
fc4d30a6
...
...
@@ -860,7 +860,7 @@ static void b43_phy_ww(struct b43_wldev *dev)
b43_phy_write
(
dev
,
B43_PHY_OFDM
(
0xBB
),
(
b43_phy_read
(
dev
,
B43_PHY_OFDM
(
0xBB
))
&
0xF000
)
|
0x0053
);
b43_phy_write
(
dev
,
B43_PHY_OFDM61
,
(
b43_phy_read
(
dev
,
B43_PHY_OFDM61
&
0xFE1F
)
)
|
0x0120
);
(
b43_phy_read
(
dev
,
B43_PHY_OFDM61
)
&
0xFE1F
)
|
0x0120
);
b43_phy_write
(
dev
,
B43_PHY_OFDM
(
0x13
),
(
b43_phy_read
(
dev
,
B43_PHY_OFDM
(
0x13
))
&
0x0FFF
)
|
0x3000
);
b43_phy_write
(
dev
,
B43_PHY_OFDM
(
0x14
),
...
...
drivers/net/wireless/p54usb.c
View file @
fc4d30a6
...
...
@@ -63,6 +63,7 @@ static struct usb_device_id p54u_table[] __devinitdata = {
{
USB_DEVICE
(
0x0cde
,
0x0008
)},
/* Sagem XG703A */
{
USB_DEVICE
(
0x0d8e
,
0x3762
)},
/* DLink DWL-G120 Cohiba */
{
USB_DEVICE
(
0x09aa
,
0x1000
)},
/* Spinnaker Proto board */
{
USB_DEVICE
(
0x124a
,
0x4025
)},
/* IOGear GWU513 (GW3887IK chip) */
{
USB_DEVICE
(
0x13b1
,
0x000a
)},
/* Linksys WUSB54G ver 2 */
{
USB_DEVICE
(
0x13B1
,
0x000C
)},
/* Linksys WUSB54AG */
{
USB_DEVICE
(
0x1435
,
0x0427
)},
/* Inventel UR054G */
...
...
drivers/net/wireless/rt2x00/rt2x00.h
View file @
fc4d30a6
...
...
@@ -620,6 +620,9 @@ struct rt2x00_dev {
* This will only be compiled in when required.
*/
#ifdef CONFIG_RT2X00_LIB_RFKILL
unsigned
long
rfkill_state
;
#define RFKILL_STATE_ALLOCATED 1
#define RFKILL_STATE_REGISTERED 2
struct
rfkill
*
rfkill
;
struct
input_polled_dev
*
poll_dev
;
#endif
/* CONFIG_RT2X00_LIB_RFKILL */
...
...
drivers/net/wireless/rt2x00/rt2x00dev.c
View file @
fc4d30a6
...
...
@@ -1098,7 +1098,7 @@ static void rt2x00lib_uninitialize(struct rt2x00_dev *rt2x00dev)
return
;
/*
* Unregister
rfkill
.
* Unregister
extra components
.
*/
rt2x00rfkill_unregister
(
rt2x00dev
);
...
...
@@ -1139,11 +1139,9 @@ static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)
__set_bit
(
DEVICE_INITIALIZED
,
&
rt2x00dev
->
flags
);
/*
* Register the
rfkill handler
.
* Register the
extra components
.
*/
status
=
rt2x00rfkill_register
(
rt2x00dev
);
if
(
status
)
goto
exit_unitialize
;
rt2x00rfkill_register
(
rt2x00dev
);
return
0
;
...
...
@@ -1313,15 +1311,9 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
}
/*
* Allocatie rfkill.
*/
retval
=
rt2x00rfkill_allocate
(
rt2x00dev
);
if
(
retval
)
goto
exit
;
/*
* Open the debugfs entry.
* Register extra components.
*/
rt2x00rfkill_allocate
(
rt2x00dev
);
rt2x00debug_register
(
rt2x00dev
);
__set_bit
(
DEVICE_PRESENT
,
&
rt2x00dev
->
flags
);
...
...
@@ -1350,13 +1342,9 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
rt2x00lib_uninitialize
(
rt2x00dev
);
/*
*
Close debugfs entry.
*
Free extra components
*/
rt2x00debug_deregister
(
rt2x00dev
);
/*
* Free rfkill
*/
rt2x00rfkill_free
(
rt2x00dev
);
/*
...
...
@@ -1395,11 +1383,15 @@ int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
__set_bit
(
DEVICE_STARTED_SUSPEND
,
&
rt2x00dev
->
flags
);
/*
* Disable radio and unitialize all items
* that must be recreated on resume.
* Disable radio.
*/
rt2x00lib_stop
(
rt2x00dev
);
rt2x00lib_uninitialize
(
rt2x00dev
);
/*
* Suspend/disable extra components.
*/
rt2x00rfkill_suspend
(
rt2x00dev
);
rt2x00debug_deregister
(
rt2x00dev
);
exit:
...
...
@@ -1422,9 +1414,10 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
NOTICE
(
rt2x00dev
,
"Waking up.
\n
"
);
/*
*
Open the debugfs entry
.
*
Restore/enable extra components
.
*/
rt2x00debug_register
(
rt2x00dev
);
rt2x00rfkill_resume
(
rt2x00dev
);
/*
* Only continue if mac80211 had open interfaces.
...
...
drivers/net/wireless/rt2x00/rt2x00lib.h
View file @
fc4d30a6
...
...
@@ -100,28 +100,36 @@ static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
* RFkill handlers.
*/
#ifdef CONFIG_RT2X00_LIB_RFKILL
int
rt2x00rfkill_register
(
struct
rt2x00_dev
*
rt2x00dev
);
void
rt2x00rfkill_register
(
struct
rt2x00_dev
*
rt2x00dev
);
void
rt2x00rfkill_unregister
(
struct
rt2x00_dev
*
rt2x00dev
);
int
rt2x00rfkill_allocate
(
struct
rt2x00_dev
*
rt2x00dev
);
void
rt2x00rfkill_allocate
(
struct
rt2x00_dev
*
rt2x00dev
);
void
rt2x00rfkill_free
(
struct
rt2x00_dev
*
rt2x00dev
);
void
rt2x00rfkill_suspend
(
struct
rt2x00_dev
*
rt2x00dev
);
void
rt2x00rfkill_resume
(
struct
rt2x00_dev
*
rt2x00dev
);
#else
static
inline
int
rt2x00rfkill_register
(
struct
rt2x00_dev
*
rt2x00dev
)
static
inline
void
rt2x00rfkill_register
(
struct
rt2x00_dev
*
rt2x00dev
)
{
return
0
;
}
static
inline
void
rt2x00rfkill_unregister
(
struct
rt2x00_dev
*
rt2x00dev
)
{
}
static
inline
int
rt2x00rfkill_allocate
(
struct
rt2x00_dev
*
rt2x00dev
)
static
inline
void
rt2x00rfkill_allocate
(
struct
rt2x00_dev
*
rt2x00dev
)
{
return
0
;
}
static
inline
void
rt2x00rfkill_free
(
struct
rt2x00_dev
*
rt2x00dev
)
{
}
static
inline
void
rt2x00rfkill_suspend
(
struct
rt2x00_dev
*
rt2x00dev
)
{
}
static
inline
void
rt2x00rfkill_resume
(
struct
rt2x00_dev
*
rt2x00dev
)
{
}
#endif
/* CONFIG_RT2X00_LIB_RFKILL */
#endif
/* RT2X00LIB_H */
drivers/net/wireless/rt2x00/rt2x00rfkill.c
View file @
fc4d30a6
...
...
@@ -69,56 +69,81 @@ static void rt2x00rfkill_poll(struct input_polled_dev *poll_dev)
}
}
int
rt2x00rfkill_register
(
struct
rt2x00_dev
*
rt2x00dev
)
void
rt2x00rfkill_register
(
struct
rt2x00_dev
*
rt2x00dev
)
{
int
retval
;
if
(
!
test_bit
(
CONFIG_SUPPORT_HW_BUTTON
,
&
rt2x00dev
->
flags
))
return
0
;
if
(
!
test_bit
(
CONFIG_SUPPORT_HW_BUTTON
,
&
rt2x00dev
->
flags
)
||
!
test_bit
(
RFKILL_STATE_ALLOCATED
,
&
rt2x00dev
->
rfkill_state
))
return
;
retval
=
rfkill_register
(
rt2x00dev
->
rfkill
);
if
(
retval
)
{
if
(
rfkill_register
(
rt2x00dev
->
rfkill
))
{
ERROR
(
rt2x00dev
,
"Failed to register rfkill handler.
\n
"
);
return
retval
;
return
;
}
retval
=
input_register_polled_device
(
rt2x00dev
->
poll_dev
);
if
(
retval
)
{
if
(
input_register_polled_device
(
rt2x00dev
->
poll_dev
))
{
ERROR
(
rt2x00dev
,
"Failed to register polled device.
\n
"
);
rfkill_unregister
(
rt2x00dev
->
rfkill
);
return
retval
;
return
;
}
__set_bit
(
RFKILL_STATE_REGISTERED
,
&
rt2x00dev
->
rfkill_state
);
/*
* Force initial poll which will detect the initial device state,
* and correctly sends the signal to the rfkill layer about this
* state.
*/
rt2x00rfkill_poll
(
rt2x00dev
->
poll_dev
);
return
0
;
}
void
rt2x00rfkill_unregister
(
struct
rt2x00_dev
*
rt2x00dev
)
{
if
(
!
test_bit
(
CONFIG_SUPPORT_HW_BUTTON
,
&
rt2x00dev
->
flags
))
if
(
!
test_bit
(
CONFIG_SUPPORT_HW_BUTTON
,
&
rt2x00dev
->
flags
)
||
!
test_bit
(
RFKILL_STATE_REGISTERED
,
&
rt2x00dev
->
rfkill_state
))
return
;
input_unregister_polled_device
(
rt2x00dev
->
poll_dev
);
rfkill_unregister
(
rt2x00dev
->
rfkill
);
__clear_bit
(
RFKILL_STATE_REGISTERED
,
&
rt2x00dev
->
rfkill_state
);
}
int
rt2x00rfkill_allocate
(
struct
rt2x00_dev
*
rt2x00dev
)
static
struct
input_polled_dev
*
rt2x00rfkill_allocate_polldev
(
struct
rt2x00_dev
*
rt2x00dev
)
{
struct
device
*
device
=
wiphy_dev
(
rt2x00dev
->
hw
->
wiphy
);
struct
input_polled_dev
*
poll_dev
;
poll_dev
=
input_allocate_polled_device
();
if
(
!
poll_dev
)
return
NULL
;
poll_dev
->
private
=
rt2x00dev
;
poll_dev
->
poll
=
rt2x00rfkill_poll
;
poll_dev
->
poll_interval
=
RFKILL_POLL_INTERVAL
;
poll_dev
->
input
->
name
=
rt2x00dev
->
ops
->
name
;
poll_dev
->
input
->
phys
=
wiphy_name
(
rt2x00dev
->
hw
->
wiphy
);
poll_dev
->
input
->
id
.
bustype
=
BUS_HOST
;
poll_dev
->
input
->
id
.
vendor
=
0x1814
;
poll_dev
->
input
->
id
.
product
=
rt2x00dev
->
chip
.
rt
;
poll_dev
->
input
->
id
.
version
=
rt2x00dev
->
chip
.
rev
;
poll_dev
->
input
->
dev
.
parent
=
wiphy_dev
(
rt2x00dev
->
hw
->
wiphy
);
poll_dev
->
input
->
evbit
[
0
]
=
BIT
(
EV_KEY
);
set_bit
(
KEY_WLAN
,
poll_dev
->
input
->
keybit
);
return
poll_dev
;
}
void
rt2x00rfkill_allocate
(
struct
rt2x00_dev
*
rt2x00dev
)
{
if
(
!
test_bit
(
CONFIG_SUPPORT_HW_BUTTON
,
&
rt2x00dev
->
flags
))
return
0
;
return
;
rt2x00dev
->
rfkill
=
rfkill_allocate
(
device
,
RFKILL_TYPE_WLAN
);
rt2x00dev
->
rfkill
=
rfkill_allocate
(
wiphy_dev
(
rt2x00dev
->
hw
->
wiphy
),
RFKILL_TYPE_WLAN
);
if
(
!
rt2x00dev
->
rfkill
)
{
ERROR
(
rt2x00dev
,
"Failed to allocate rfkill handler.
\n
"
);
goto
exit
;
return
;
}
rt2x00dev
->
rfkill
->
name
=
rt2x00dev
->
ops
->
name
;
...
...
@@ -126,40 +151,49 @@ int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
rt2x00dev
->
rfkill
->
state
=
-
1
;
rt2x00dev
->
rfkill
->
toggle_radio
=
rt2x00rfkill_toggle_radio
;
rt2x00dev
->
poll_dev
=
input_allocate_polled_device
(
);
rt2x00dev
->
poll_dev
=
rt2x00rfkill_allocate_polldev
(
rt2x00dev
);
if
(
!
rt2x00dev
->
poll_dev
)
{
ERROR
(
rt2x00dev
,
"Failed to allocate polled device.
\n
"
);
goto
exit_free_rfkill
;
rfkill_free
(
rt2x00dev
->
rfkill
);
rt2x00dev
->
rfkill
=
NULL
;
return
;
}
rt2x00dev
->
poll_dev
->
private
=
rt2x00dev
;
rt2x00dev
->
poll_dev
->
poll
=
rt2x00rfkill_poll
;
rt2x00dev
->
poll_dev
->
poll_interval
=
RFKILL_POLL_INTERVAL
;
return
;
}
rt2x00dev
->
poll_dev
->
input
->
name
=
rt2x00dev
->
ops
->
name
;
rt2x00dev
->
poll_dev
->
input
->
phys
=
wiphy_name
(
rt2x00dev
->
hw
->
wiphy
);
rt2x00dev
->
poll_dev
->
input
->
id
.
bustype
=
BUS_HOST
;
rt2x00dev
->
poll_dev
->
input
->
id
.
vendor
=
0x1814
;
rt2x00dev
->
poll_dev
->
input
->
id
.
product
=
rt2x00dev
->
chip
.
rt
;
rt2x00dev
->
poll_dev
->
input
->
id
.
version
=
rt2x00dev
->
chip
.
rev
;
rt2x00dev
->
poll_dev
->
input
->
dev
.
parent
=
device
;
rt2x00dev
->
poll_dev
->
input
->
evbit
[
0
]
=
BIT
(
EV_KEY
);
set_bit
(
KEY_WLAN
,
rt2x00dev
->
poll_dev
->
input
->
keybit
);
void
rt2x00rfkill_free
(
struct
rt2x00_dev
*
rt2x00dev
)
{
if
(
!
test_bit
(
CONFIG_SUPPORT_HW_BUTTON
,
&
rt2x00dev
->
flags
)
||
!
test_bit
(
RFKILL_STATE_ALLOCATED
,
&
rt2x00dev
->
rfkill_state
))
return
;
return
0
;
input_free_polled_device
(
rt2x00dev
->
poll_dev
);
rt2x00dev
->
poll_dev
=
NULL
;
exit_free_rfkill:
rfkill_free
(
rt2x00dev
->
rfkill
);
exit:
return
-
ENOMEM
;
rt2x00dev
->
rfkill
=
NULL
;
}
void
rt2x00rfkill_
free
(
struct
rt2x00_dev
*
rt2x00dev
)
void
rt2x00rfkill_
suspend
(
struct
rt2x00_dev
*
rt2x00dev
)
{
if
(
!
test_bit
(
CONFIG_SUPPORT_HW_BUTTON
,
&
rt2x00dev
->
flags
))
if
(
!
test_bit
(
CONFIG_SUPPORT_HW_BUTTON
,
&
rt2x00dev
->
flags
)
||
!
test_bit
(
RFKILL_STATE_ALLOCATED
,
&
rt2x00dev
->
rfkill_state
))
return
;
input_free_polled_device
(
rt2x00dev
->
poll_dev
);
rfkill_free
(
rt2x00dev
->
rfkill
);
rt2x00dev
->
poll_dev
=
NULL
;
}
void
rt2x00rfkill_resume
(
struct
rt2x00_dev
*
rt2x00dev
)
{
if
(
!
test_bit
(
CONFIG_SUPPORT_HW_BUTTON
,
&
rt2x00dev
->
flags
)
||
!
test_bit
(
RFKILL_STATE_ALLOCATED
,
&
rt2x00dev
->
rfkill_state
))
return
;
rt2x00dev
->
poll_dev
=
rt2x00rfkill_allocate_polldev
(
rt2x00dev
);
if
(
!
rt2x00dev
->
poll_dev
)
{
ERROR
(
rt2x00dev
,
"Failed to allocate polled device.
\n
"
);
return
;
}
}
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