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
8701ff0a
Commit
8701ff0a
authored
12 years ago
by
John W. Linville
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
parents
f4fb4b21
00f157b4
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
45 additions
and
34 deletions
+45
-34
drivers/net/wireless/ath/ath9k/ar5008_phy.c
drivers/net/wireless/ath/ath9k/ar5008_phy.c
+1
-24
drivers/net/wireless/ath/ath9k/ar9002_hw.c
drivers/net/wireless/ath/ath9k/ar9002_hw.c
+19
-0
drivers/net/wireless/ath/ath9k/hw.h
drivers/net/wireless/ath/ath9k/hw.h
+0
-1
drivers/net/wireless/ath/carl9170/tx.c
drivers/net/wireless/ath/carl9170/tx.c
+6
-3
drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
+3
-3
drivers/net/wireless/iwlwifi/iwl-agn-sta.c
drivers/net/wireless/iwlwifi/iwl-agn-sta.c
+9
-1
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/cfg80211.c
+1
-0
drivers/net/wireless/rt2x00/rt2x00dev.c
drivers/net/wireless/rt2x00/rt2x00dev.c
+2
-1
net/mac80211/iface.c
net/mac80211/iface.c
+3
-0
net/mac80211/rate.c
net/mac80211/rate.c
+1
-1
No files found.
drivers/net/wireless/ath/ath9k/ar5008_phy.c
View file @
8701ff0a
...
@@ -489,8 +489,6 @@ static int ar5008_hw_rf_alloc_ext_banks(struct ath_hw *ah)
...
@@ -489,8 +489,6 @@ static int ar5008_hw_rf_alloc_ext_banks(struct ath_hw *ah)
ATH_ALLOC_BANK
(
ah
->
analogBank6Data
,
ah
->
iniBank6
.
ia_rows
);
ATH_ALLOC_BANK
(
ah
->
analogBank6Data
,
ah
->
iniBank6
.
ia_rows
);
ATH_ALLOC_BANK
(
ah
->
analogBank6TPCData
,
ah
->
iniBank6TPC
.
ia_rows
);
ATH_ALLOC_BANK
(
ah
->
analogBank6TPCData
,
ah
->
iniBank6TPC
.
ia_rows
);
ATH_ALLOC_BANK
(
ah
->
analogBank7Data
,
ah
->
iniBank7
.
ia_rows
);
ATH_ALLOC_BANK
(
ah
->
analogBank7Data
,
ah
->
iniBank7
.
ia_rows
);
ATH_ALLOC_BANK
(
ah
->
addac5416_21
,
ah
->
iniAddac
.
ia_rows
*
ah
->
iniAddac
.
ia_columns
);
ATH_ALLOC_BANK
(
ah
->
bank6Temp
,
ah
->
iniBank6
.
ia_rows
);
ATH_ALLOC_BANK
(
ah
->
bank6Temp
,
ah
->
iniBank6
.
ia_rows
);
return
0
;
return
0
;
...
@@ -519,7 +517,6 @@ static void ar5008_hw_rf_free_ext_banks(struct ath_hw *ah)
...
@@ -519,7 +517,6 @@ static void ar5008_hw_rf_free_ext_banks(struct ath_hw *ah)
ATH_FREE_BANK
(
ah
->
analogBank6Data
);
ATH_FREE_BANK
(
ah
->
analogBank6Data
);
ATH_FREE_BANK
(
ah
->
analogBank6TPCData
);
ATH_FREE_BANK
(
ah
->
analogBank6TPCData
);
ATH_FREE_BANK
(
ah
->
analogBank7Data
);
ATH_FREE_BANK
(
ah
->
analogBank7Data
);
ATH_FREE_BANK
(
ah
->
addac5416_21
);
ATH_FREE_BANK
(
ah
->
bank6Temp
);
ATH_FREE_BANK
(
ah
->
bank6Temp
);
#undef ATH_FREE_BANK
#undef ATH_FREE_BANK
...
@@ -805,27 +802,7 @@ static int ar5008_hw_process_ini(struct ath_hw *ah,
...
@@ -805,27 +802,7 @@ static int ar5008_hw_process_ini(struct ath_hw *ah,
if
(
ah
->
eep_ops
->
set_addac
)
if
(
ah
->
eep_ops
->
set_addac
)
ah
->
eep_ops
->
set_addac
(
ah
,
chan
);
ah
->
eep_ops
->
set_addac
(
ah
,
chan
);
if
(
AR_SREV_5416_22_OR_LATER
(
ah
))
{
REG_WRITE_ARRAY
(
&
ah
->
iniAddac
,
1
,
regWrites
);
REG_WRITE_ARRAY
(
&
ah
->
iniAddac
,
1
,
regWrites
);
}
else
{
struct
ar5416IniArray
temp
;
u32
addacSize
=
sizeof
(
u32
)
*
ah
->
iniAddac
.
ia_rows
*
ah
->
iniAddac
.
ia_columns
;
/* For AR5416 2.0/2.1 */
memcpy
(
ah
->
addac5416_21
,
ah
->
iniAddac
.
ia_array
,
addacSize
);
/* override CLKDRV value at [row, column] = [31, 1] */
(
ah
->
addac5416_21
)[
31
*
ah
->
iniAddac
.
ia_columns
+
1
]
=
0
;
temp
.
ia_array
=
ah
->
addac5416_21
;
temp
.
ia_columns
=
ah
->
iniAddac
.
ia_columns
;
temp
.
ia_rows
=
ah
->
iniAddac
.
ia_rows
;
REG_WRITE_ARRAY
(
&
temp
,
1
,
regWrites
);
}
REG_WRITE
(
ah
,
AR_PHY_ADC_SERIAL_CTL
,
AR_PHY_SEL_INTERNAL_ADDAC
);
REG_WRITE
(
ah
,
AR_PHY_ADC_SERIAL_CTL
,
AR_PHY_SEL_INTERNAL_ADDAC
);
ENABLE_REGWRITE_BUFFER
(
ah
);
ENABLE_REGWRITE_BUFFER
(
ah
);
...
...
This diff is collapsed.
Click to expand it.
drivers/net/wireless/ath/ath9k/ar9002_hw.c
View file @
8701ff0a
...
@@ -141,6 +141,25 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
...
@@ -141,6 +141,25 @@ static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
INIT_INI_ARRAY
(
&
ah
->
iniBank6TPC
,
ar5416Bank6TPC_9100
,
INIT_INI_ARRAY
(
&
ah
->
iniBank6TPC
,
ar5416Bank6TPC_9100
,
ARRAY_SIZE
(
ar5416Bank6TPC_9100
),
3
);
ARRAY_SIZE
(
ar5416Bank6TPC_9100
),
3
);
}
}
/* iniAddac needs to be modified for these chips */
if
(
AR_SREV_9160
(
ah
)
||
!
AR_SREV_5416_22_OR_LATER
(
ah
))
{
struct
ar5416IniArray
*
addac
=
&
ah
->
iniAddac
;
u32
size
=
sizeof
(
u32
)
*
addac
->
ia_rows
*
addac
->
ia_columns
;
u32
*
data
;
data
=
kmalloc
(
size
,
GFP_KERNEL
);
if
(
!
data
)
return
;
memcpy
(
data
,
addac
->
ia_array
,
size
);
addac
->
ia_array
=
data
;
if
(
!
AR_SREV_5416_22_OR_LATER
(
ah
))
{
/* override CLKDRV value */
INI_RA
(
addac
,
31
,
1
)
=
0
;
}
}
}
}
/* Support for Japan ch.14 (2484) spread */
/* Support for Japan ch.14 (2484) spread */
...
...
This diff is collapsed.
Click to expand it.
drivers/net/wireless/ath/ath9k/hw.h
View file @
8701ff0a
...
@@ -781,7 +781,6 @@ struct ath_hw {
...
@@ -781,7 +781,6 @@ struct ath_hw {
u32
*
analogBank6Data
;
u32
*
analogBank6Data
;
u32
*
analogBank6TPCData
;
u32
*
analogBank6TPCData
;
u32
*
analogBank7Data
;
u32
*
analogBank7Data
;
u32
*
addac5416_21
;
u32
*
bank6Temp
;
u32
*
bank6Temp
;
u8
txpower_limit
;
u8
txpower_limit
;
...
...
This diff is collapsed.
Click to expand it.
drivers/net/wireless/ath/carl9170/tx.c
View file @
8701ff0a
...
@@ -1236,6 +1236,7 @@ static bool carl9170_tx_ps_drop(struct ar9170 *ar, struct sk_buff *skb)
...
@@ -1236,6 +1236,7 @@ static bool carl9170_tx_ps_drop(struct ar9170 *ar, struct sk_buff *skb)
{
{
struct
ieee80211_sta
*
sta
;
struct
ieee80211_sta
*
sta
;
struct
carl9170_sta_info
*
sta_info
;
struct
carl9170_sta_info
*
sta_info
;
struct
ieee80211_tx_info
*
tx_info
;
rcu_read_lock
();
rcu_read_lock
();
sta
=
__carl9170_get_tx_sta
(
ar
,
skb
);
sta
=
__carl9170_get_tx_sta
(
ar
,
skb
);
...
@@ -1243,16 +1244,18 @@ static bool carl9170_tx_ps_drop(struct ar9170 *ar, struct sk_buff *skb)
...
@@ -1243,16 +1244,18 @@ static bool carl9170_tx_ps_drop(struct ar9170 *ar, struct sk_buff *skb)
goto
out_rcu
;
goto
out_rcu
;
sta_info
=
(
void
*
)
sta
->
drv_priv
;
sta_info
=
(
void
*
)
sta
->
drv_priv
;
if
(
unlikely
(
sta_info
->
sleeping
))
{
tx_info
=
IEEE80211_SKB_CB
(
skb
);
struct
ieee80211_tx_info
*
tx_info
;
if
(
unlikely
(
sta_info
->
sleeping
)
&&
!
(
tx_info
->
flags
&
(
IEEE80211_TX_CTL_POLL_RESPONSE
|
IEEE80211_TX_CTL_CLEAR_PS_FILT
)))
{
rcu_read_unlock
();
rcu_read_unlock
();
tx_info
=
IEEE80211_SKB_CB
(
skb
);
if
(
tx_info
->
flags
&
IEEE80211_TX_CTL_AMPDU
)
if
(
tx_info
->
flags
&
IEEE80211_TX_CTL_AMPDU
)
atomic_dec
(
&
ar
->
tx_ampdu_upload
);
atomic_dec
(
&
ar
->
tx_ampdu_upload
);
tx_info
->
flags
|=
IEEE80211_TX_STAT_TX_FILTERED
;
tx_info
->
flags
|=
IEEE80211_TX_STAT_TX_FILTERED
;
carl9170_release_dev_space
(
ar
,
skb
);
carl9170_tx_status
(
ar
,
skb
,
false
);
carl9170_tx_status
(
ar
,
skb
,
false
);
return
true
;
return
true
;
}
}
...
...
This diff is collapsed.
Click to expand it.
drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
View file @
8701ff0a
...
@@ -1070,9 +1070,9 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
...
@@ -1070,9 +1070,9 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
IEEE80211_TX_STAT_AMPDU_NO_BACK
;
IEEE80211_TX_STAT_AMPDU_NO_BACK
;
skb_pull
(
p
,
D11_PHY_HDR_LEN
);
skb_pull
(
p
,
D11_PHY_HDR_LEN
);
skb_pull
(
p
,
D11_TXH_LEN
);
skb_pull
(
p
,
D11_TXH_LEN
);
wiphy_err
(
wiphy
,
"%s: BA Timeout, seq %d, in_"
BCMMSG
(
wiphy
,
"transit %d
\n
"
,
"AMPDU status"
,
seq
,
"BA Timeout, seq %d, in_transit %d
\n
"
,
ini
->
tx_in_transit
);
seq
,
ini
->
tx_in_transit
);
ieee80211_tx_status_irqsafe
(
wlc
->
pub
->
ieee_hw
,
ieee80211_tx_status_irqsafe
(
wlc
->
pub
->
ieee_hw
,
p
);
p
);
}
}
...
...
This diff is collapsed.
Click to expand it.
drivers/net/wireless/iwlwifi/iwl-agn-sta.c
View file @
8701ff0a
...
@@ -1190,6 +1190,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,
...
@@ -1190,6 +1190,7 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,
unsigned
long
flags
;
unsigned
long
flags
;
struct
iwl_addsta_cmd
sta_cmd
;
struct
iwl_addsta_cmd
sta_cmd
;
u8
sta_id
=
iwlagn_key_sta_id
(
priv
,
ctx
->
vif
,
sta
);
u8
sta_id
=
iwlagn_key_sta_id
(
priv
,
ctx
->
vif
,
sta
);
__le16
key_flags
;
/* if station isn't there, neither is the key */
/* if station isn't there, neither is the key */
if
(
sta_id
==
IWL_INVALID_STATION
)
if
(
sta_id
==
IWL_INVALID_STATION
)
...
@@ -1215,7 +1216,14 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,
...
@@ -1215,7 +1216,14 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv,
IWL_ERR
(
priv
,
"offset %d not used in uCode key table.
\n
"
,
IWL_ERR
(
priv
,
"offset %d not used in uCode key table.
\n
"
,
keyconf
->
hw_key_idx
);
keyconf
->
hw_key_idx
);
sta_cmd
.
key
.
key_flags
=
STA_KEY_FLG_NO_ENC
|
STA_KEY_FLG_INVALID
;
key_flags
=
cpu_to_le16
(
keyconf
->
keyidx
<<
STA_KEY_FLG_KEYID_POS
);
key_flags
|=
STA_KEY_FLG_MAP_KEY_MSK
|
STA_KEY_FLG_NO_ENC
|
STA_KEY_FLG_INVALID
;
if
(
!
(
keyconf
->
flags
&
IEEE80211_KEY_FLAG_PAIRWISE
))
key_flags
|=
STA_KEY_MULTICAST_MSK
;
sta_cmd
.
key
.
key_flags
=
key_flags
;
sta_cmd
.
key
.
key_offset
=
WEP_INVALID_OFFSET
;
sta_cmd
.
key
.
key_offset
=
WEP_INVALID_OFFSET
;
sta_cmd
.
sta
.
modify_mask
=
STA_MODIFY_KEY_MASK
;
sta_cmd
.
sta
.
modify_mask
=
STA_MODIFY_KEY_MASK
;
sta_cmd
.
mode
=
STA_CONTROL_MODIFY_MSK
;
sta_cmd
.
mode
=
STA_CONTROL_MODIFY_MSK
;
...
...
This diff is collapsed.
Click to expand it.
drivers/net/wireless/mwifiex/cfg80211.c
View file @
8701ff0a
...
@@ -872,6 +872,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
...
@@ -872,6 +872,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
priv
->
sec_info
.
wpa_enabled
=
false
;
priv
->
sec_info
.
wpa_enabled
=
false
;
priv
->
sec_info
.
wpa2_enabled
=
false
;
priv
->
sec_info
.
wpa2_enabled
=
false
;
priv
->
wep_key_curr_index
=
0
;
priv
->
wep_key_curr_index
=
0
;
priv
->
sec_info
.
encryption_mode
=
0
;
ret
=
mwifiex_set_encode
(
priv
,
NULL
,
0
,
0
,
1
);
ret
=
mwifiex_set_encode
(
priv
,
NULL
,
0
,
0
,
1
);
if
(
mode
==
NL80211_IFTYPE_ADHOC
)
{
if
(
mode
==
NL80211_IFTYPE_ADHOC
)
{
...
...
This diff is collapsed.
Click to expand it.
drivers/net/wireless/rt2x00/rt2x00dev.c
View file @
8701ff0a
...
@@ -1236,6 +1236,7 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
...
@@ -1236,6 +1236,7 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
cancel_work_sync
(
&
rt2x00dev
->
rxdone_work
);
cancel_work_sync
(
&
rt2x00dev
->
rxdone_work
);
cancel_work_sync
(
&
rt2x00dev
->
txdone_work
);
cancel_work_sync
(
&
rt2x00dev
->
txdone_work
);
}
}
if
(
rt2x00dev
->
workqueue
)
destroy_workqueue
(
rt2x00dev
->
workqueue
);
destroy_workqueue
(
rt2x00dev
->
workqueue
);
/*
/*
...
...
This diff is collapsed.
Click to expand it.
net/mac80211/iface.c
View file @
8701ff0a
...
@@ -1344,6 +1344,9 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
...
@@ -1344,6 +1344,9 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
hw_roc
=
true
;
hw_roc
=
true
;
list_for_each_entry
(
sdata
,
&
local
->
interfaces
,
list
)
{
list_for_each_entry
(
sdata
,
&
local
->
interfaces
,
list
)
{
if
(
sdata
->
vif
.
type
==
NL80211_IFTYPE_MONITOR
||
sdata
->
vif
.
type
==
NL80211_IFTYPE_AP_VLAN
)
continue
;
if
(
sdata
->
old_idle
==
sdata
->
vif
.
bss_conf
.
idle
)
if
(
sdata
->
old_idle
==
sdata
->
vif
.
bss_conf
.
idle
)
continue
;
continue
;
if
(
!
ieee80211_sdata_running
(
sdata
))
if
(
!
ieee80211_sdata_running
(
sdata
))
...
...
This diff is collapsed.
Click to expand it.
net/mac80211/rate.c
View file @
8701ff0a
...
@@ -447,7 +447,7 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
...
@@ -447,7 +447,7 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
for
(
i
=
0
;
i
<
IEEE80211_TX_MAX_RATES
;
i
++
)
{
for
(
i
=
0
;
i
<
IEEE80211_TX_MAX_RATES
;
i
++
)
{
info
->
control
.
rates
[
i
].
idx
=
-
1
;
info
->
control
.
rates
[
i
].
idx
=
-
1
;
info
->
control
.
rates
[
i
].
flags
=
0
;
info
->
control
.
rates
[
i
].
flags
=
0
;
info
->
control
.
rates
[
i
].
count
=
1
;
info
->
control
.
rates
[
i
].
count
=
0
;
}
}
if
(
sdata
->
local
->
hw
.
flags
&
IEEE80211_HW_HAS_RATE_CONTROL
)
if
(
sdata
->
local
->
hw
.
flags
&
IEEE80211_HW_HAS_RATE_CONTROL
)
...
...
This diff is collapsed.
Click to expand it.
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