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
4c07ab0f
Commit
4c07ab0f
authored
Sep 22, 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
cec5eb7b
6115e855
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
10 deletions
+14
-10
drivers/net/wireless/ath9k/core.c
drivers/net/wireless/ath9k/core.c
+2
-2
drivers/net/wireless/ath9k/core.h
drivers/net/wireless/ath9k/core.h
+0
-1
drivers/net/wireless/ath9k/main.c
drivers/net/wireless/ath9k/main.c
+8
-4
drivers/net/wireless/ath9k/xmit.c
drivers/net/wireless/ath9k/xmit.c
+3
-3
drivers/net/wireless/zd1211rw/zd_usb.c
drivers/net/wireless/zd1211rw/zd_usb.c
+1
-0
No files found.
drivers/net/wireless/ath9k/core.c
View file @
4c07ab0f
...
...
@@ -294,8 +294,6 @@ static int ath_stop(struct ath_softc *sc)
* hardware is gone (invalid).
*/
if
(
!
sc
->
sc_invalid
)
ath9k_hw_set_interrupts
(
ah
,
0
);
ath_draintxq
(
sc
,
false
);
if
(
!
sc
->
sc_invalid
)
{
ath_stoprecv
(
sc
);
...
...
@@ -1336,6 +1334,8 @@ void ath_deinit(struct ath_softc *sc)
DPRINTF
(
sc
,
ATH_DBG_CONFIG
,
"%s
\n
"
,
__func__
);
tasklet_kill
(
&
sc
->
intr_tq
);
tasklet_kill
(
&
sc
->
bcon_tasklet
);
ath_stop
(
sc
);
if
(
!
sc
->
sc_invalid
)
ath9k_hw_setpower
(
sc
->
sc_ah
,
ATH9K_PM_AWAKE
);
...
...
drivers/net/wireless/ath9k/core.h
View file @
4c07ab0f
...
...
@@ -974,7 +974,6 @@ struct ath_softc {
u32
sc_keymax
;
/* size of key cache */
DECLARE_BITMAP
(
sc_keymap
,
ATH_KEYMAX
);
/* key use bit map */
u8
sc_splitmic
;
/* split TKIP MIC keys */
int
sc_keytype
;
/* RX */
struct
list_head
sc_rxbuf
;
...
...
drivers/net/wireless/ath9k/main.c
View file @
4c07ab0f
...
...
@@ -206,8 +206,6 @@ static int ath_key_config(struct ath_softc *sc,
if
(
!
ret
)
return
-
EIO
;
if
(
mac
)
sc
->
sc_keytype
=
hk
.
kv_type
;
return
0
;
}
...
...
@@ -778,7 +776,6 @@ static int ath9k_set_key(struct ieee80211_hw *hw,
case
DISABLE_KEY
:
ath_key_delete
(
sc
,
key
);
clear_bit
(
key
->
keyidx
,
sc
->
sc_keymap
);
sc
->
sc_keytype
=
ATH9K_CIPHER_CLR
;
break
;
default:
ret
=
-
EINVAL
;
...
...
@@ -1414,10 +1411,17 @@ static void ath_pci_remove(struct pci_dev *pdev)
{
struct
ieee80211_hw
*
hw
=
pci_get_drvdata
(
pdev
);
struct
ath_softc
*
sc
=
hw
->
priv
;
enum
ath9k_int
status
;
if
(
pdev
->
irq
)
if
(
pdev
->
irq
)
{
ath9k_hw_set_interrupts
(
sc
->
sc_ah
,
0
);
/* clear the ISR */
ath9k_hw_getisr
(
sc
->
sc_ah
,
&
status
);
sc
->
sc_invalid
=
1
;
free_irq
(
pdev
->
irq
,
sc
);
}
ath_detach
(
sc
);
pci_iounmap
(
pdev
,
sc
->
mem
);
pci_release_region
(
pdev
,
0
);
pci_disable_device
(
pdev
);
...
...
drivers/net/wireless/ath9k/xmit.c
View file @
4c07ab0f
...
...
@@ -315,11 +315,11 @@ static int ath_tx_prepare(struct ath_softc *sc,
txctl
->
keyix
=
tx_info
->
control
.
hw_key
->
hw_key_idx
;
txctl
->
frmlen
+=
tx_info
->
control
.
icv_len
;
if
(
sc
->
sc_keytype
==
ATH9K_CIPHER
_WEP
)
if
(
tx_info
->
control
.
hw_key
->
alg
==
ALG
_WEP
)
txctl
->
keytype
=
ATH9K_KEY_TYPE_WEP
;
else
if
(
sc
->
sc_keytype
==
ATH9K_CIPHER
_TKIP
)
else
if
(
tx_info
->
control
.
hw_key
->
alg
==
ALG
_TKIP
)
txctl
->
keytype
=
ATH9K_KEY_TYPE_TKIP
;
else
if
(
sc
->
sc_keytype
==
ATH9K_CIPHER_AES_CCM
)
else
if
(
tx_info
->
control
.
hw_key
->
alg
==
ALG_CCMP
)
txctl
->
keytype
=
ATH9K_KEY_TYPE_AES
;
}
...
...
drivers/net/wireless/zd1211rw/zd_usb.c
View file @
4c07ab0f
...
...
@@ -58,6 +58,7 @@ static struct usb_device_id usb_ids[] = {
{
USB_DEVICE
(
0x0586
,
0x3407
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x129b
,
0x1666
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x157e
,
0x300a
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x0105
,
0x145f
),
.
driver_info
=
DEVICE_ZD1211
},
/* ZD1211B */
{
USB_DEVICE
(
0x0ace
,
0x1215
),
.
driver_info
=
DEVICE_ZD1211B
},
{
USB_DEVICE
(
0x157e
,
0x300d
),
.
driver_info
=
DEVICE_ZD1211B
},
...
...
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