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
ca409d6e
Commit
ca409d6e
authored
Nov 06, 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
3b53fbf4
d54bc4e3
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
40 additions
and
12 deletions
+40
-12
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/ath5k/base.c
+3
-1
drivers/net/wireless/ath5k/desc.c
drivers/net/wireless/ath5k/desc.c
+8
-8
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-agn.c
+5
-1
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/iwlwifi/iwl-scan.c
+7
-0
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
+14
-1
drivers/net/wireless/zd1211rw/zd_usb.c
drivers/net/wireless/zd1211rw/zd_usb.c
+2
-0
net/rfkill/rfkill.c
net/rfkill/rfkill.c
+1
-1
No files found.
drivers/net/wireless/ath5k/base.c
View file @
ca409d6e
...
...
@@ -2942,8 +2942,10 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,
sc
->
opmode
!=
NL80211_IFTYPE_MESH_POINT
&&
test_bit
(
ATH_STAT_PROMISC
,
sc
->
status
))
rfilt
|=
AR5K_RX_FILTER_PROM
;
if
(
sc
->
opmode
==
NL80211_IFTYPE_ADHOC
)
if
(
sc
->
opmode
==
NL80211_IFTYPE_STATION
||
sc
->
opmode
==
NL80211_IFTYPE_ADHOC
)
{
rfilt
|=
AR5K_RX_FILTER_BEACON
;
}
/* Set filters */
ath5k_hw_set_rx_filter
(
ah
,
rfilt
);
...
...
drivers/net/wireless/ath5k/desc.c
View file @
ca409d6e
...
...
@@ -531,10 +531,10 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
AR5K_5210_RX_DESC_STATUS0_RECEIVE_SIGNAL
);
rs
->
rs_rate
=
AR5K_REG_MS
(
rx_status
->
rx_status_0
,
AR5K_5210_RX_DESC_STATUS0_RECEIVE_RATE
);
rs
->
rs_antenna
=
rx_status
->
rx_status_0
&
AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA
;
rs
->
rs_more
=
rx_status
->
rx_status_0
&
AR5K_5210_RX_DESC_STATUS0_MORE
;
rs
->
rs_antenna
=
AR5K_REG_MS
(
rx_status
->
rx_status_0
,
AR5K_5210_RX_DESC_STATUS0_RECEIVE_ANTENNA
)
;
rs
->
rs_more
=
!!
(
rx_status
->
rx_status_0
&
AR5K_5210_RX_DESC_STATUS0_MORE
)
;
/* TODO: this timestamp is 13 bit, later on we assume 15 bit */
rs
->
rs_tstamp
=
AR5K_REG_MS
(
rx_status
->
rx_status_1
,
AR5K_5210_RX_DESC_STATUS1_RECEIVE_TIMESTAMP
);
...
...
@@ -607,10 +607,10 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
AR5K_5212_RX_DESC_STATUS0_RECEIVE_SIGNAL
);
rs
->
rs_rate
=
AR5K_REG_MS
(
rx_status
->
rx_status_0
,
AR5K_5212_RX_DESC_STATUS0_RECEIVE_RATE
);
rs
->
rs_antenna
=
rx_status
->
rx_status_0
&
AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA
;
rs
->
rs_more
=
rx_status
->
rx_status_0
&
AR5K_5212_RX_DESC_STATUS0_MORE
;
rs
->
rs_antenna
=
AR5K_REG_MS
(
rx_status
->
rx_status_0
,
AR5K_5212_RX_DESC_STATUS0_RECEIVE_ANTENNA
)
;
rs
->
rs_more
=
!!
(
rx_status
->
rx_status_0
&
AR5K_5212_RX_DESC_STATUS0_MORE
)
;
rs
->
rs_tstamp
=
AR5K_REG_MS
(
rx_status
->
rx_status_1
,
AR5K_5212_RX_DESC_STATUS1_RECEIVE_TIMESTAMP
);
rs
->
rs_status
=
0
;
...
...
drivers/net/wireless/iwlwifi/iwl-agn.c
View file @
ca409d6e
...
...
@@ -3252,7 +3252,11 @@ static void iwl4965_mac_update_tkip_key(struct ieee80211_hw *hw,
return
;
}
iwl_scan_cancel_timeout
(
priv
,
100
);
if
(
iwl_scan_cancel
(
priv
))
{
/* cancel scan failed, just live w/ bad key and rely
briefly on SW decryption */
return
;
}
key_flags
|=
(
STA_KEY_FLG_TKIP
|
STA_KEY_FLG_MAP_KEY_MSK
);
key_flags
|=
cpu_to_le16
(
keyconf
->
keyidx
<<
STA_KEY_FLG_KEYID_POS
);
...
...
drivers/net/wireless/iwlwifi/iwl-scan.c
View file @
ca409d6e
...
...
@@ -896,6 +896,13 @@ static void iwl_bg_request_scan(struct work_struct *data)
return
;
done:
/* Cannot perform scan. Make sure we clear scanning
* bits from status so next scan request can be performed.
* If we don't clear scanning status bit here all next scan
* will fail
*/
clear_bit
(
STATUS_SCAN_HW
,
&
priv
->
status
);
clear_bit
(
STATUS_SCANNING
,
&
priv
->
status
);
/* inform mac80211 scan aborted */
queue_work
(
priv
->
workqueue
,
&
priv
->
scan_completed
);
mutex_unlock
(
&
priv
->
mutex
);
...
...
drivers/net/wireless/iwlwifi/iwl3945-base.c
View file @
ca409d6e
...
...
@@ -5768,7 +5768,6 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
if
(
priv
->
error_recovering
)
iwl3945_error_recovery
(
priv
);
ieee80211_notify_mac
(
priv
->
hw
,
IEEE80211_NOTIFY_RE_ASSOC
);
return
;
restart:
...
...
@@ -6013,6 +6012,7 @@ static void iwl3945_bg_alive_start(struct work_struct *data)
mutex_lock
(
&
priv
->
mutex
);
iwl3945_alive_start
(
priv
);
mutex_unlock
(
&
priv
->
mutex
);
ieee80211_notify_mac
(
priv
->
hw
,
IEEE80211_NOTIFY_RE_ASSOC
);
}
static
void
iwl3945_bg_rf_kill
(
struct
work_struct
*
work
)
...
...
@@ -6256,6 +6256,11 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
n_probes
,
(
void
*
)
&
scan
->
data
[
le16_to_cpu
(
scan
->
tx_cmd
.
len
)]);
if
(
scan
->
channel_count
==
0
)
{
IWL_DEBUG_SCAN
(
"channel count %d
\n
"
,
scan
->
channel_count
);
goto
done
;
}
cmd
.
len
+=
le16_to_cpu
(
scan
->
tx_cmd
.
len
)
+
scan
->
channel_count
*
sizeof
(
struct
iwl3945_scan_channel
);
cmd
.
data
=
scan
;
...
...
@@ -6273,6 +6278,14 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
return
;
done:
/* can not perform scan make sure we clear scanning
* bits from status so next scan request can be performed.
* if we dont clear scanning status bit here all next scan
* will fail
*/
clear_bit
(
STATUS_SCAN_HW
,
&
priv
->
status
);
clear_bit
(
STATUS_SCANNING
,
&
priv
->
status
);
/* inform mac80211 scan aborted */
queue_work
(
priv
->
workqueue
,
&
priv
->
scan_completed
);
mutex_unlock
(
&
priv
->
mutex
);
...
...
drivers/net/wireless/zd1211rw/zd_usb.c
View file @
ca409d6e
...
...
@@ -61,6 +61,7 @@ static struct usb_device_id usb_ids[] = {
{
USB_DEVICE
(
0x0105
,
0x145f
),
.
driver_info
=
DEVICE_ZD1211
},
/* ZD1211B */
{
USB_DEVICE
(
0x0ace
,
0x1215
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x0ace
,
0xb215
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x157e
,
0x300d
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x079b
,
0x0062
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x1582
,
0x6003
),
.
driver_info
=
DEVICE_ZD1211B
},
...
...
@@ -82,6 +83,7 @@ static struct usb_device_id usb_ids[] = {
{
USB_DEVICE
(
0x0cde
,
0x001a
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x0586
,
0x340a
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x0471
,
0x1237
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x07fa
,
0x1196
),
.
driver_info
=
DEVICE_ZD1211B
},
/* "Driverless" devices that need ejecting */
{
USB_DEVICE
(
0x0ace
,
0x2011
),
.
driver_info
=
DEVICE_INSTALLER
},
{
USB_DEVICE
(
0x0ace
,
0x20ff
),
.
driver_info
=
DEVICE_INSTALLER
},
...
...
net/rfkill/rfkill.c
View file @
ca409d6e
...
...
@@ -603,7 +603,7 @@ static int rfkill_check_duplicity(const struct rfkill *rfkill)
}
/* 0: first switch of its kind */
return
test_bit
(
rfkill
->
type
,
seen
)
;
return
(
test_bit
(
rfkill
->
type
,
seen
))
?
1
:
0
;
}
static
int
rfkill_add_switch
(
struct
rfkill
*
rfkill
)
...
...
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