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
1ed3aad1
Commit
1ed3aad1
authored
Apr 22, 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
f01cb5fb
069f40fc
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
32 additions
and
20 deletions
+32
-20
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/ath/ath9k/recv.c
+1
-1
drivers/net/wireless/iwlegacy/iwl-4965-tx.c
drivers/net/wireless/iwlegacy/iwl-4965-tx.c
+7
-3
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+1
-6
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+7
-3
net/bluetooth/hci_core.c
net/bluetooth/hci_core.c
+2
-3
net/bluetooth/hci_event.c
net/bluetooth/hci_event.c
+0
-2
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_core.c
+1
-0
net/bluetooth/sco.c
net/bluetooth/sco.c
+9
-0
net/mac80211/cfg.c
net/mac80211/cfg.c
+2
-0
net/mac80211/debugfs_netdev.c
net/mac80211/debugfs_netdev.c
+2
-2
No files found.
drivers/net/wireless/ath/ath9k/recv.c
View file @
1ed3aad1
...
@@ -506,7 +506,7 @@ bool ath_stoprecv(struct ath_softc *sc)
...
@@ -506,7 +506,7 @@ bool ath_stoprecv(struct ath_softc *sc)
"confusing the DMA engine when we start RX up
\n
"
);
"confusing the DMA engine when we start RX up
\n
"
);
ATH_DBG_WARN_ON_ONCE
(
!
stopped
);
ATH_DBG_WARN_ON_ONCE
(
!
stopped
);
}
}
return
stopped
||
reset
;
return
stopped
&&
!
reset
;
}
}
void
ath_flushrecv
(
struct
ath_softc
*
sc
)
void
ath_flushrecv
(
struct
ath_softc
*
sc
)
...
...
drivers/net/wireless/iwlegacy/iwl-4965-tx.c
View file @
1ed3aad1
...
@@ -1127,12 +1127,16 @@ int iwl4965_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)
...
@@ -1127,12 +1127,16 @@ int iwl4965_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)
q
->
read_ptr
=
iwl_legacy_queue_inc_wrap
(
q
->
read_ptr
,
q
->
n_bd
))
{
q
->
read_ptr
=
iwl_legacy_queue_inc_wrap
(
q
->
read_ptr
,
q
->
n_bd
))
{
tx_info
=
&
txq
->
txb
[
txq
->
q
.
read_ptr
];
tx_info
=
&
txq
->
txb
[
txq
->
q
.
read_ptr
];
iwl4965_tx_status
(
priv
,
tx_info
,
txq_id
>=
IWL4965_FIRST_AMPDU_QUEUE
);
if
(
WARN_ON_ONCE
(
tx_info
->
skb
==
NULL
))
continue
;
hdr
=
(
struct
ieee80211_hdr
*
)
tx_info
->
skb
->
data
;
hdr
=
(
struct
ieee80211_hdr
*
)
tx_info
->
skb
->
data
;
if
(
hdr
&&
ieee80211_is_data_qos
(
hdr
->
frame_control
))
if
(
ieee80211_is_data_qos
(
hdr
->
frame_control
))
nfreed
++
;
nfreed
++
;
iwl4965_tx_status
(
priv
,
tx_info
,
txq_id
>=
IWL4965_FIRST_AMPDU_QUEUE
);
tx_info
->
skb
=
NULL
;
tx_info
->
skb
=
NULL
;
priv
->
cfg
->
ops
->
lib
->
txq_free_tfd
(
priv
,
txq
);
priv
->
cfg
->
ops
->
lib
->
txq_free_tfd
(
priv
,
txq
);
...
...
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
View file @
1ed3aad1
...
@@ -335,7 +335,6 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
...
@@ -335,7 +335,6 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
struct
ieee80211_channel
*
channel
=
conf
->
channel
;
struct
ieee80211_channel
*
channel
=
conf
->
channel
;
const
struct
iwl_channel_info
*
ch_info
;
const
struct
iwl_channel_info
*
ch_info
;
int
ret
=
0
;
int
ret
=
0
;
bool
ht_changed
[
NUM_IWL_RXON_CTX
]
=
{};
IWL_DEBUG_MAC80211
(
priv
,
"changed %#x"
,
changed
);
IWL_DEBUG_MAC80211
(
priv
,
"changed %#x"
,
changed
);
...
@@ -383,10 +382,8 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
...
@@ -383,10 +382,8 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
for_each_context
(
priv
,
ctx
)
{
for_each_context
(
priv
,
ctx
)
{
/* Configure HT40 channels */
/* Configure HT40 channels */
if
(
ctx
->
ht
.
enabled
!=
conf_is_ht
(
conf
))
{
if
(
ctx
->
ht
.
enabled
!=
conf_is_ht
(
conf
))
ctx
->
ht
.
enabled
=
conf_is_ht
(
conf
);
ctx
->
ht
.
enabled
=
conf_is_ht
(
conf
);
ht_changed
[
ctx
->
ctxid
]
=
true
;
}
if
(
ctx
->
ht
.
enabled
)
{
if
(
ctx
->
ht
.
enabled
)
{
if
(
conf_is_ht40_minus
(
conf
))
{
if
(
conf_is_ht40_minus
(
conf
))
{
...
@@ -455,8 +452,6 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
...
@@ -455,8 +452,6 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
if
(
!
memcmp
(
&
ctx
->
staging
,
&
ctx
->
active
,
sizeof
(
ctx
->
staging
)))
if
(
!
memcmp
(
&
ctx
->
staging
,
&
ctx
->
active
,
sizeof
(
ctx
->
staging
)))
continue
;
continue
;
iwlagn_commit_rxon
(
priv
,
ctx
);
iwlagn_commit_rxon
(
priv
,
ctx
);
if
(
ht_changed
[
ctx
->
ctxid
])
iwlagn_update_qos
(
priv
,
ctx
);
}
}
out:
out:
mutex_unlock
(
&
priv
->
mutex
);
mutex_unlock
(
&
priv
->
mutex
);
...
...
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
View file @
1ed3aad1
...
@@ -1224,12 +1224,16 @@ int iwlagn_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)
...
@@ -1224,12 +1224,16 @@ int iwlagn_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index)
q
->
read_ptr
=
iwl_queue_inc_wrap
(
q
->
read_ptr
,
q
->
n_bd
))
{
q
->
read_ptr
=
iwl_queue_inc_wrap
(
q
->
read_ptr
,
q
->
n_bd
))
{
tx_info
=
&
txq
->
txb
[
txq
->
q
.
read_ptr
];
tx_info
=
&
txq
->
txb
[
txq
->
q
.
read_ptr
];
iwlagn_tx_status
(
priv
,
tx_info
,
txq_id
>=
IWLAGN_FIRST_AMPDU_QUEUE
);
if
(
WARN_ON_ONCE
(
tx_info
->
skb
==
NULL
))
continue
;
hdr
=
(
struct
ieee80211_hdr
*
)
tx_info
->
skb
->
data
;
hdr
=
(
struct
ieee80211_hdr
*
)
tx_info
->
skb
->
data
;
if
(
hdr
&&
ieee80211_is_data_qos
(
hdr
->
frame_control
))
if
(
ieee80211_is_data_qos
(
hdr
->
frame_control
))
nfreed
++
;
nfreed
++
;
iwlagn_tx_status
(
priv
,
tx_info
,
txq_id
>=
IWLAGN_FIRST_AMPDU_QUEUE
);
tx_info
->
skb
=
NULL
;
tx_info
->
skb
=
NULL
;
if
(
priv
->
cfg
->
ops
->
lib
->
txq_inval_byte_cnt_tbl
)
if
(
priv
->
cfg
->
ops
->
lib
->
txq_inval_byte_cnt_tbl
)
...
...
net/bluetooth/hci_core.c
View file @
1ed3aad1
...
@@ -587,10 +587,8 @@ static int hci_dev_do_close(struct hci_dev *hdev)
...
@@ -587,10 +587,8 @@ static int hci_dev_do_close(struct hci_dev *hdev)
hci_req_cancel
(
hdev
,
ENODEV
);
hci_req_cancel
(
hdev
,
ENODEV
);
hci_req_lock
(
hdev
);
hci_req_lock
(
hdev
);
/* Stop timer, it might be running */
del_timer_sync
(
&
hdev
->
cmd_timer
);
if
(
!
test_and_clear_bit
(
HCI_UP
,
&
hdev
->
flags
))
{
if
(
!
test_and_clear_bit
(
HCI_UP
,
&
hdev
->
flags
))
{
del_timer_sync
(
&
hdev
->
cmd_timer
);
hci_req_unlock
(
hdev
);
hci_req_unlock
(
hdev
);
return
0
;
return
0
;
}
}
...
@@ -629,6 +627,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)
...
@@ -629,6 +627,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)
/* Drop last sent command */
/* Drop last sent command */
if
(
hdev
->
sent_cmd
)
{
if
(
hdev
->
sent_cmd
)
{
del_timer_sync
(
&
hdev
->
cmd_timer
);
kfree_skb
(
hdev
->
sent_cmd
);
kfree_skb
(
hdev
->
sent_cmd
);
hdev
->
sent_cmd
=
NULL
;
hdev
->
sent_cmd
=
NULL
;
}
}
...
...
net/bluetooth/hci_event.c
View file @
1ed3aad1
...
@@ -2387,8 +2387,6 @@ static inline void hci_io_capa_reply_evt(struct hci_dev *hdev, struct sk_buff *s
...
@@ -2387,8 +2387,6 @@ static inline void hci_io_capa_reply_evt(struct hci_dev *hdev, struct sk_buff *s
if
(
!
conn
)
if
(
!
conn
)
goto
unlock
;
goto
unlock
;
hci_conn_hold
(
conn
);
conn
->
remote_cap
=
ev
->
capability
;
conn
->
remote_cap
=
ev
->
capability
;
conn
->
remote_oob
=
ev
->
oob_data
;
conn
->
remote_oob
=
ev
->
oob_data
;
conn
->
remote_auth
=
ev
->
authentication
;
conn
->
remote_auth
=
ev
->
authentication
;
...
...
net/bluetooth/l2cap_core.c
View file @
1ed3aad1
...
@@ -1051,6 +1051,7 @@ static void l2cap_retransmit_one_frame(struct sock *sk, u8 tx_seq)
...
@@ -1051,6 +1051,7 @@ static void l2cap_retransmit_one_frame(struct sock *sk, u8 tx_seq)
tx_skb
=
skb_clone
(
skb
,
GFP_ATOMIC
);
tx_skb
=
skb_clone
(
skb
,
GFP_ATOMIC
);
bt_cb
(
skb
)
->
retries
++
;
bt_cb
(
skb
)
->
retries
++
;
control
=
get_unaligned_le16
(
tx_skb
->
data
+
L2CAP_HDR_SIZE
);
control
=
get_unaligned_le16
(
tx_skb
->
data
+
L2CAP_HDR_SIZE
);
control
&=
L2CAP_CTRL_SAR
;
if
(
pi
->
conn_state
&
L2CAP_CONN_SEND_FBIT
)
{
if
(
pi
->
conn_state
&
L2CAP_CONN_SEND_FBIT
)
{
control
|=
L2CAP_CTRL_FINAL
;
control
|=
L2CAP_CTRL_FINAL
;
...
...
net/bluetooth/sco.c
View file @
1ed3aad1
...
@@ -369,6 +369,15 @@ static void __sco_sock_close(struct sock *sk)
...
@@ -369,6 +369,15 @@ static void __sco_sock_close(struct sock *sk)
case
BT_CONNECTED
:
case
BT_CONNECTED
:
case
BT_CONFIG
:
case
BT_CONFIG
:
if
(
sco_pi
(
sk
)
->
conn
)
{
sk
->
sk_state
=
BT_DISCONN
;
sco_sock_set_timer
(
sk
,
SCO_DISCONN_TIMEOUT
);
hci_conn_put
(
sco_pi
(
sk
)
->
conn
->
hcon
);
sco_pi
(
sk
)
->
conn
=
NULL
;
}
else
sco_chan_del
(
sk
,
ECONNRESET
);
break
;
case
BT_CONNECT
:
case
BT_CONNECT
:
case
BT_DISCONN
:
case
BT_DISCONN
:
sco_chan_del
(
sk
,
ECONNRESET
);
sco_chan_del
(
sk
,
ECONNRESET
);
...
...
net/mac80211/cfg.c
View file @
1ed3aad1
...
@@ -1504,6 +1504,8 @@ int __ieee80211_request_smps(struct ieee80211_sub_if_data *sdata,
...
@@ -1504,6 +1504,8 @@ int __ieee80211_request_smps(struct ieee80211_sub_if_data *sdata,
enum
ieee80211_smps_mode
old_req
;
enum
ieee80211_smps_mode
old_req
;
int
err
;
int
err
;
lockdep_assert_held
(
&
sdata
->
u
.
mgd
.
mtx
);
old_req
=
sdata
->
u
.
mgd
.
req_smps
;
old_req
=
sdata
->
u
.
mgd
.
req_smps
;
sdata
->
u
.
mgd
.
req_smps
=
smps_mode
;
sdata
->
u
.
mgd
.
req_smps
=
smps_mode
;
...
...
net/mac80211/debugfs_netdev.c
View file @
1ed3aad1
...
@@ -177,9 +177,9 @@ static int ieee80211_set_smps(struct ieee80211_sub_if_data *sdata,
...
@@ -177,9 +177,9 @@ static int ieee80211_set_smps(struct ieee80211_sub_if_data *sdata,
if
(
sdata
->
vif
.
type
!=
NL80211_IFTYPE_STATION
)
if
(
sdata
->
vif
.
type
!=
NL80211_IFTYPE_STATION
)
return
-
EOPNOTSUPP
;
return
-
EOPNOTSUPP
;
mutex_lock
(
&
local
->
iflist_
mtx
);
mutex_lock
(
&
sdata
->
u
.
mgd
.
mtx
);
err
=
__ieee80211_request_smps
(
sdata
,
smps_mode
);
err
=
__ieee80211_request_smps
(
sdata
,
smps_mode
);
mutex_unlock
(
&
local
->
iflist_
mtx
);
mutex_unlock
(
&
sdata
->
u
.
mgd
.
mtx
);
return
err
;
return
err
;
}
}
...
...
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