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
nexedi
linux
Commits
e0985f27
Commit
e0985f27
authored
Feb 08, 2011
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
429a01a7
fc7c976d
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
30 additions
and
9 deletions
+30
-9
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/ath9k.h
+1
-1
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/main.c
+0
-2
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/ath/ath9k/xmit.c
+6
-1
drivers/net/wireless/ath/carl9170/rx.c
drivers/net/wireless/ath/carl9170/rx.c
+1
-1
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
+2
-0
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-agn.c
+6
-0
drivers/net/wireless/wl1251/main.c
drivers/net/wireless/wl1251/main.c
+3
-0
drivers/ssb/pcmcia.c
drivers/ssb/pcmcia.c
+1
-1
net/mac80211/cfg.c
net/mac80211/cfg.c
+2
-0
net/mac80211/ieee80211_i.h
net/mac80211/ieee80211_i.h
+1
-1
net/mac80211/status.c
net/mac80211/status.c
+6
-1
net/mac80211/tx.c
net/mac80211/tx.c
+1
-1
No files found.
drivers/net/wireless/ath/ath9k/ath9k.h
View file @
e0985f27
...
...
@@ -218,6 +218,7 @@ struct ath_frame_info {
struct
ath_buf_state
{
u8
bf_type
;
u8
bfs_paprd
;
unsigned
long
bfs_paprd_timestamp
;
enum
ath9k_internal_frame_type
bfs_ftype
;
};
...
...
@@ -593,7 +594,6 @@ struct ath_softc {
struct
work_struct
paprd_work
;
struct
work_struct
hw_check_work
;
struct
completion
paprd_complete
;
bool
paprd_pending
;
u32
intrstatus
;
u32
sc_flags
;
/* SC_OP_* */
...
...
drivers/net/wireless/ath/ath9k/main.c
View file @
e0985f27
...
...
@@ -342,7 +342,6 @@ static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int
tx_info
->
control
.
rates
[
1
].
idx
=
-
1
;
init_completion
(
&
sc
->
paprd_complete
);
sc
->
paprd_pending
=
true
;
txctl
.
paprd
=
BIT
(
chain
);
if
(
ath_tx_start
(
hw
,
skb
,
&
txctl
)
!=
0
)
{
...
...
@@ -353,7 +352,6 @@ static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int
time_left
=
wait_for_completion_timeout
(
&
sc
->
paprd_complete
,
msecs_to_jiffies
(
ATH_PAPRD_TIMEOUT
));
sc
->
paprd_pending
=
false
;
if
(
!
time_left
)
ath_dbg
(
ath9k_hw_common
(
sc
->
sc_ah
),
ATH_DBG_CALIBRATE
,
...
...
drivers/net/wireless/ath/ath9k/xmit.c
View file @
e0985f27
...
...
@@ -1725,6 +1725,9 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
ar9003_hw_set_paprd_txdesc
(
sc
->
sc_ah
,
bf
->
bf_desc
,
bf
->
bf_state
.
bfs_paprd
);
if
(
txctl
->
paprd
)
bf
->
bf_state
.
bfs_paprd_timestamp
=
jiffies
;
ath_tx_send_normal
(
sc
,
txctl
->
txq
,
tid
,
&
bf_head
);
}
...
...
@@ -1886,7 +1889,9 @@ static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
bf
->
bf_buf_addr
=
0
;
if
(
bf
->
bf_state
.
bfs_paprd
)
{
if
(
!
sc
->
paprd_pending
)
if
(
time_after
(
jiffies
,
bf
->
bf_state
.
bfs_paprd_timestamp
+
msecs_to_jiffies
(
ATH_PAPRD_TIMEOUT
)))
dev_kfree_skb_any
(
skb
);
else
complete
(
&
sc
->
paprd_complete
);
...
...
drivers/net/wireless/ath/carl9170/rx.c
View file @
e0985f27
...
...
@@ -564,7 +564,7 @@ static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len)
cam
=
ieee80211_check_tim
(
tim_ie
,
tim_len
,
ar
->
common
.
curaid
);
/* 2. Maybe the AP wants to send multicast/broadcast data? */
cam
=
!!
(
tim_ie
->
bitmap_ctrl
&
0x01
);
cam
|
=
!!
(
tim_ie
->
bitmap_ctrl
&
0x01
);
if
(
!
cam
)
{
/* back to low-power land. */
...
...
drivers/net/wireless/iwlwifi/iwl-6000.c
View file @
e0985f27
...
...
@@ -681,6 +681,8 @@ struct iwl_cfg iwl6000i_2bg_cfg = {
.fw_name_pre = IWL6050_FW_PRE, \
.ucode_api_max = IWL6050_UCODE_API_MAX, \
.ucode_api_min = IWL6050_UCODE_API_MIN, \
.valid_tx_ant = ANT_AB,
/* .cfg overwrite */
\
.valid_rx_ant = ANT_AB,
/* .cfg overwrite */
\
.ops = &iwl6050_ops, \
.eeprom_ver = EEPROM_6050_EEPROM_VERSION, \
.eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION, \
...
...
drivers/net/wireless/iwlwifi/iwl-agn.c
View file @
e0985f27
...
...
@@ -1157,6 +1157,9 @@ static void iwl_irq_tasklet_legacy(struct iwl_priv *priv)
/* only Re-enable if disabled by irq */
if
(
test_bit
(
STATUS_INT_ENABLED
,
&
priv
->
status
))
iwl_enable_interrupts
(
priv
);
/* Re-enable RF_KILL if it occurred */
else
if
(
handled
&
CSR_INT_BIT_RF_KILL
)
iwl_enable_rfkill_int
(
priv
);
#ifdef CONFIG_IWLWIFI_DEBUG
if
(
iwl_get_debug_level
(
priv
)
&
(
IWL_DL_ISR
))
{
...
...
@@ -1371,6 +1374,9 @@ static void iwl_irq_tasklet(struct iwl_priv *priv)
/* only Re-enable if disabled by irq */
if
(
test_bit
(
STATUS_INT_ENABLED
,
&
priv
->
status
))
iwl_enable_interrupts
(
priv
);
/* Re-enable RF_KILL if it occurred */
else
if
(
handled
&
CSR_INT_BIT_RF_KILL
)
iwl_enable_rfkill_int
(
priv
);
}
/* the threshold ratio of actual_ack_cnt to expected_ack_cnt in percent */
...
...
drivers/net/wireless/wl1251/main.c
View file @
e0985f27
...
...
@@ -1039,6 +1039,9 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
if
(
changed
&
BSS_CHANGED_BEACON
)
{
beacon
=
ieee80211_beacon_get
(
hw
,
vif
);
if
(
!
beacon
)
goto
out_sleep
;
ret
=
wl1251_cmd_template_set
(
wl
,
CMD_BEACON
,
beacon
->
data
,
beacon
->
len
);
...
...
drivers/ssb/pcmcia.c
View file @
e0985f27
...
...
@@ -733,7 +733,7 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
/* Fetch the vendor specific tuples. */
res
=
pcmcia_loop_tuple
(
bus
->
host_pcmcia
,
SSB_PCMCIA_CIS
,
ssb_pcmcia_do_get_invariants
,
sprom
);
ssb_pcmcia_do_get_invariants
,
iv
);
if
((
res
==
0
)
||
(
res
==
-
ENOSPC
))
return
0
;
...
...
net/mac80211/cfg.c
View file @
e0985f27
...
...
@@ -1822,6 +1822,7 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
*
cookie
^=
2
;
IEEE80211_SKB_CB
(
skb
)
->
flags
|=
IEEE80211_TX_CTL_TX_OFFCHAN
;
local
->
hw_roc_skb
=
skb
;
local
->
hw_roc_skb_for_status
=
skb
;
mutex_unlock
(
&
local
->
mtx
);
return
0
;
...
...
@@ -1875,6 +1876,7 @@ static int ieee80211_mgmt_tx_cancel_wait(struct wiphy *wiphy,
if
(
ret
==
0
)
{
kfree_skb
(
local
->
hw_roc_skb
);
local
->
hw_roc_skb
=
NULL
;
local
->
hw_roc_skb_for_status
=
NULL
;
}
mutex_unlock
(
&
local
->
mtx
);
...
...
net/mac80211/ieee80211_i.h
View file @
e0985f27
...
...
@@ -953,7 +953,7 @@ struct ieee80211_local {
struct
ieee80211_channel
*
hw_roc_channel
;
struct
net_device
*
hw_roc_dev
;
struct
sk_buff
*
hw_roc_skb
;
struct
sk_buff
*
hw_roc_skb
,
*
hw_roc_skb_for_status
;
struct
work_struct
hw_roc_start
,
hw_roc_done
;
enum
nl80211_channel_type
hw_roc_channel_type
;
unsigned
int
hw_roc_duration
;
...
...
net/mac80211/status.c
View file @
e0985f27
...
...
@@ -323,6 +323,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
if
(
info
->
flags
&
IEEE80211_TX_INTFL_NL80211_FRAME_TX
)
{
struct
ieee80211_work
*
wk
;
u64
cookie
=
(
unsigned
long
)
skb
;
rcu_read_lock
();
list_for_each_entry_rcu
(
wk
,
&
local
->
work_list
,
list
)
{
...
...
@@ -334,8 +335,12 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
break
;
}
rcu_read_unlock
();
if
(
local
->
hw_roc_skb_for_status
==
skb
)
{
cookie
=
local
->
hw_roc_cookie
^
2
;
local
->
hw_roc_skb_for_status
=
NULL
;
}
cfg80211_mgmt_tx_status
(
skb
->
dev
,
(
unsigned
long
)
skb
,
skb
->
data
,
skb
->
len
,
skb
->
dev
,
cookie
,
skb
->
data
,
skb
->
len
,
!!
(
info
->
flags
&
IEEE80211_TX_STAT_ACK
),
GFP_ATOMIC
);
}
...
...
net/mac80211/tx.c
View file @
e0985f27
...
...
@@ -1547,7 +1547,7 @@ static int ieee80211_skb_resize(struct ieee80211_local *local,
skb_orphan
(
skb
);
}
if
(
skb_
header_
cloned
(
skb
))
if
(
skb_cloned
(
skb
))
I802_DEBUG_INC
(
local
->
tx_expand_skb_head_cloned
);
else
if
(
head_need
||
tail_need
)
I802_DEBUG_INC
(
local
->
tx_expand_skb_head
);
...
...
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