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
db138908
Commit
db138908
authored
Mar 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
04024b93
8bc8aecd
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
34 additions
and
24 deletions
+34
-24
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/ath/ath9k/xmit.c
+2
-2
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-agn.c
+5
-2
drivers/net/wireless/orinoco/main.c
drivers/net/wireless/orinoco/main.c
+1
-1
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/rt2x00/rt2800usb.c
+6
-1
drivers/net/wireless/rtlwifi/efuse.c
drivers/net/wireless/rtlwifi/efuse.c
+15
-16
drivers/net/wireless/zd1211rw/zd_usb.c
drivers/net/wireless/zd1211rw/zd_usb.c
+1
-0
include/net/cfg80211.h
include/net/cfg80211.h
+2
-1
include/net/mac80211.h
include/net/mac80211.h
+1
-1
net/mac80211/sta_info.c
net/mac80211/sta_info.c
+1
-0
No files found.
drivers/net/wireless/ath/ath9k/xmit.c
View file @
db138908
...
@@ -1725,8 +1725,8 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
...
@@ -1725,8 +1725,8 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
u8
tidno
;
u8
tidno
;
spin_lock_bh
(
&
txctl
->
txq
->
axq_lock
);
spin_lock_bh
(
&
txctl
->
txq
->
axq_lock
);
if
((
sc
->
sc_flags
&
SC_OP_TXAGGR
)
&&
txctl
->
an
&&
if
(
ieee80211_is_data_qos
(
hdr
->
frame_control
)
&&
txctl
->
an
)
{
ieee80211_is_data_qos
(
hdr
->
frame_control
)
)
{
tidno
=
ieee80211_get_qos_ctl
(
hdr
)[
0
]
&
tidno
=
ieee80211_get_qos_ctl
(
hdr
)[
0
]
&
IEEE80211_QOS_CTL_TID_MASK
;
IEEE80211_QOS_CTL_TID_MASK
;
tid
=
ATH_AN_2_TID
(
txctl
->
an
,
tidno
);
tid
=
ATH_AN_2_TID
(
txctl
->
an
,
tidno
);
...
...
drivers/net/wireless/iwlwifi/iwl-agn.c
View file @
db138908
...
@@ -3009,14 +3009,17 @@ static int iwl_mac_offchannel_tx_cancel_wait(struct ieee80211_hw *hw)
...
@@ -3009,14 +3009,17 @@ static int iwl_mac_offchannel_tx_cancel_wait(struct ieee80211_hw *hw)
mutex_lock
(
&
priv
->
mutex
);
mutex_lock
(
&
priv
->
mutex
);
if
(
!
priv
->
_agn
.
offchan_tx_skb
)
if
(
!
priv
->
_agn
.
offchan_tx_skb
)
{
return
-
EINVAL
;
ret
=
-
EINVAL
;
goto
unlock
;
}
priv
->
_agn
.
offchan_tx_skb
=
NULL
;
priv
->
_agn
.
offchan_tx_skb
=
NULL
;
ret
=
iwl_scan_cancel_timeout
(
priv
,
200
);
ret
=
iwl_scan_cancel_timeout
(
priv
,
200
);
if
(
ret
)
if
(
ret
)
ret
=
-
EIO
;
ret
=
-
EIO
;
unlock:
mutex_unlock
(
&
priv
->
mutex
);
mutex_unlock
(
&
priv
->
mutex
);
return
ret
;
return
ret
;
...
...
drivers/net/wireless/orinoco/main.c
View file @
db138908
...
@@ -1376,13 +1376,13 @@ static void orinoco_process_scan_results(struct work_struct *work)
...
@@ -1376,13 +1376,13 @@ static void orinoco_process_scan_results(struct work_struct *work)
spin_lock_irqsave
(
&
priv
->
scan_lock
,
flags
);
spin_lock_irqsave
(
&
priv
->
scan_lock
,
flags
);
list_for_each_entry_safe
(
sd
,
temp
,
&
priv
->
scan_list
,
list
)
{
list_for_each_entry_safe
(
sd
,
temp
,
&
priv
->
scan_list
,
list
)
{
spin_unlock_irqrestore
(
&
priv
->
scan_lock
,
flags
);
buf
=
sd
->
buf
;
buf
=
sd
->
buf
;
len
=
sd
->
len
;
len
=
sd
->
len
;
type
=
sd
->
type
;
type
=
sd
->
type
;
list_del
(
&
sd
->
list
);
list_del
(
&
sd
->
list
);
spin_unlock_irqrestore
(
&
priv
->
scan_lock
,
flags
);
kfree
(
sd
);
kfree
(
sd
);
if
(
len
>
0
)
{
if
(
len
>
0
)
{
...
...
drivers/net/wireless/rt2x00/rt2800usb.c
View file @
db138908
...
@@ -719,6 +719,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
...
@@ -719,6 +719,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
{
USB_DEVICE
(
0x0b05
,
0x1732
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x0b05
,
0x1732
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x0b05
,
0x1742
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x0b05
,
0x1742
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x0b05
,
0x1784
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x0b05
,
0x1784
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x1761
,
0x0b05
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
/* AzureWave */
/* AzureWave */
{
USB_DEVICE
(
0x13d3
,
0x3247
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x13d3
,
0x3247
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x13d3
,
0x3273
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x13d3
,
0x3273
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
...
@@ -913,7 +914,6 @@ static struct usb_device_id rt2800usb_device_table[] = {
...
@@ -913,7 +914,6 @@ static struct usb_device_id rt2800usb_device_table[] = {
{
USB_DEVICE
(
0x0b05
,
0x1760
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x0b05
,
0x1760
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x0b05
,
0x1761
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x0b05
,
0x1761
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x0b05
,
0x1790
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x0b05
,
0x1790
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x1761
,
0x0b05
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
/* AzureWave */
/* AzureWave */
{
USB_DEVICE
(
0x13d3
,
0x3262
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x13d3
,
0x3262
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x13d3
,
0x3284
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x13d3
,
0x3284
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
...
@@ -937,6 +937,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
...
@@ -937,6 +937,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
{
USB_DEVICE
(
0x07d1
,
0x3c13
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x07d1
,
0x3c13
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x07d1
,
0x3c15
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x07d1
,
0x3c15
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x07d1
,
0x3c17
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x07d1
,
0x3c17
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
/* Edimax */
{
USB_DEVICE
(
0x7392
,
0x4085
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
/* Encore */
/* Encore */
{
USB_DEVICE
(
0x203d
,
0x14a1
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x203d
,
0x14a1
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
/* Gemtek */
/* Gemtek */
...
@@ -961,6 +963,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
...
@@ -961,6 +963,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
{
USB_DEVICE
(
0x1d4d
,
0x0010
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x1d4d
,
0x0010
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x1d4d
,
0x0011
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x1d4d
,
0x0011
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
/* Planex */
/* Planex */
{
USB_DEVICE
(
0x2019
,
0x5201
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x2019
,
0xab24
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x2019
,
0xab24
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
/* Qcom */
/* Qcom */
{
USB_DEVICE
(
0x18e8
,
0x6259
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x18e8
,
0x6259
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
...
@@ -972,6 +975,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
...
@@ -972,6 +975,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
/* Sweex */
/* Sweex */
{
USB_DEVICE
(
0x177f
,
0x0153
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x177f
,
0x0153
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x177f
,
0x0313
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x177f
,
0x0313
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
/* Toshiba */
{
USB_DEVICE
(
0x0930
,
0x0a07
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
/* Zyxel */
/* Zyxel */
{
USB_DEVICE
(
0x0586
,
0x341a
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
{
USB_DEVICE
(
0x0586
,
0x341a
),
USB_DEVICE_DATA
(
&
rt2800usb_ops
)
},
#endif
#endif
...
...
drivers/net/wireless/rtlwifi/efuse.c
View file @
db138908
...
@@ -410,8 +410,8 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
...
@@ -410,8 +410,8 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
if
(
!
efuse_shadow_update_chk
(
hw
))
{
if
(
!
efuse_shadow_update_chk
(
hw
))
{
efuse_read_all_map
(
hw
,
&
rtlefuse
->
efuse_map
[
EFUSE_INIT_MAP
][
0
]);
efuse_read_all_map
(
hw
,
&
rtlefuse
->
efuse_map
[
EFUSE_INIT_MAP
][
0
]);
memcpy
(
(
void
*
)
&
rtlefuse
->
efuse_map
[
EFUSE_MODIFY_MAP
][
0
],
memcpy
(
&
rtlefuse
->
efuse_map
[
EFUSE_MODIFY_MAP
][
0
],
(
void
*
)
&
rtlefuse
->
efuse_map
[
EFUSE_INIT_MAP
][
0
],
&
rtlefuse
->
efuse_map
[
EFUSE_INIT_MAP
][
0
],
rtlpriv
->
cfg
->
maps
[
EFUSE_HWSET_MAX_SIZE
]);
rtlpriv
->
cfg
->
maps
[
EFUSE_HWSET_MAX_SIZE
]);
RT_TRACE
(
rtlpriv
,
COMP_EFUSE
,
DBG_LOUD
,
RT_TRACE
(
rtlpriv
,
COMP_EFUSE
,
DBG_LOUD
,
...
@@ -446,9 +446,9 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
...
@@ -446,9 +446,9 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
if
(
word_en
!=
0x0F
)
{
if
(
word_en
!=
0x0F
)
{
u8
tmpdata
[
8
];
u8
tmpdata
[
8
];
memcpy
(
(
void
*
)
tmpdata
,
memcpy
(
tmpdata
,
(
void
*
)(
&
rtlefuse
->
&
rtlefuse
->
efuse_map
[
EFUSE_MODIFY_MAP
][
base
],
efuse_map
[
EFUSE_MODIFY_MAP
][
base
]),
8
);
8
);
RT_PRINT_DATA
(
rtlpriv
,
COMP_INIT
,
DBG_LOUD
,
RT_PRINT_DATA
(
rtlpriv
,
COMP_INIT
,
DBG_LOUD
,
(
"U-efuse
\n
"
),
tmpdata
,
8
);
(
"U-efuse
\n
"
),
tmpdata
,
8
);
...
@@ -465,8 +465,8 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
...
@@ -465,8 +465,8 @@ bool efuse_shadow_update(struct ieee80211_hw *hw)
efuse_power_switch
(
hw
,
true
,
false
);
efuse_power_switch
(
hw
,
true
,
false
);
efuse_read_all_map
(
hw
,
&
rtlefuse
->
efuse_map
[
EFUSE_INIT_MAP
][
0
]);
efuse_read_all_map
(
hw
,
&
rtlefuse
->
efuse_map
[
EFUSE_INIT_MAP
][
0
]);
memcpy
(
(
void
*
)
&
rtlefuse
->
efuse_map
[
EFUSE_MODIFY_MAP
][
0
],
memcpy
(
&
rtlefuse
->
efuse_map
[
EFUSE_MODIFY_MAP
][
0
],
(
void
*
)
&
rtlefuse
->
efuse_map
[
EFUSE_INIT_MAP
][
0
],
&
rtlefuse
->
efuse_map
[
EFUSE_INIT_MAP
][
0
],
rtlpriv
->
cfg
->
maps
[
EFUSE_HWSET_MAX_SIZE
]);
rtlpriv
->
cfg
->
maps
[
EFUSE_HWSET_MAX_SIZE
]);
RT_TRACE
(
rtlpriv
,
COMP_EFUSE
,
DBG_LOUD
,
(
"<---
\n
"
));
RT_TRACE
(
rtlpriv
,
COMP_EFUSE
,
DBG_LOUD
,
(
"<---
\n
"
));
...
@@ -479,13 +479,12 @@ void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw)
...
@@ -479,13 +479,12 @@ void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw)
struct
rtl_efuse
*
rtlefuse
=
rtl_efuse
(
rtl_priv
(
hw
));
struct
rtl_efuse
*
rtlefuse
=
rtl_efuse
(
rtl_priv
(
hw
));
if
(
rtlefuse
->
autoload_failflag
==
true
)
{
if
(
rtlefuse
->
autoload_failflag
==
true
)
{
memset
((
void
*
)(
&
rtlefuse
->
efuse_map
[
EFUSE_INIT_MAP
][
0
]),
128
,
memset
(
&
rtlefuse
->
efuse_map
[
EFUSE_INIT_MAP
][
0
],
0xFF
,
128
);
0xFF
);
}
else
}
else
efuse_read_all_map
(
hw
,
&
rtlefuse
->
efuse_map
[
EFUSE_INIT_MAP
][
0
]);
efuse_read_all_map
(
hw
,
&
rtlefuse
->
efuse_map
[
EFUSE_INIT_MAP
][
0
]);
memcpy
(
(
void
*
)
&
rtlefuse
->
efuse_map
[
EFUSE_MODIFY_MAP
][
0
],
memcpy
(
&
rtlefuse
->
efuse_map
[
EFUSE_MODIFY_MAP
][
0
],
(
void
*
)
&
rtlefuse
->
efuse_map
[
EFUSE_INIT_MAP
][
0
],
&
rtlefuse
->
efuse_map
[
EFUSE_INIT_MAP
][
0
],
rtlpriv
->
cfg
->
maps
[
EFUSE_HWSET_MAX_SIZE
]);
rtlpriv
->
cfg
->
maps
[
EFUSE_HWSET_MAX_SIZE
]);
}
}
...
@@ -694,8 +693,8 @@ static int efuse_pg_packet_read(struct ieee80211_hw *hw, u8 offset, u8 *data)
...
@@ -694,8 +693,8 @@ static int efuse_pg_packet_read(struct ieee80211_hw *hw, u8 offset, u8 *data)
if
(
offset
>
15
)
if
(
offset
>
15
)
return
false
;
return
false
;
memset
(
(
void
*
)
data
,
PGPKT_DATA_SIZE
*
sizeof
(
u8
),
0xff
);
memset
(
data
,
0xff
,
PGPKT_DATA_SIZE
*
sizeof
(
u8
)
);
memset
(
(
void
*
)
tmpdata
,
PGPKT_DATA_SIZE
*
sizeof
(
u8
),
0xff
);
memset
(
tmpdata
,
0xff
,
PGPKT_DATA_SIZE
*
sizeof
(
u8
)
);
while
(
bcontinual
&&
(
efuse_addr
<
EFUSE_MAX_SIZE
))
{
while
(
bcontinual
&&
(
efuse_addr
<
EFUSE_MAX_SIZE
))
{
if
(
readstate
&
PG_STATE_HEADER
)
{
if
(
readstate
&
PG_STATE_HEADER
)
{
...
@@ -862,7 +861,7 @@ static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr,
...
@@ -862,7 +861,7 @@ static void efuse_write_data_case2(struct ieee80211_hw *hw, u16 *efuse_addr,
tmp_word_cnts
=
efuse_calculate_word_cnts
(
tmp_pkt
.
word_en
);
tmp_word_cnts
=
efuse_calculate_word_cnts
(
tmp_pkt
.
word_en
);
memset
(
(
void
*
)
originaldata
,
8
*
sizeof
(
u8
),
0xff
);
memset
(
originaldata
,
0xff
,
8
*
sizeof
(
u8
)
);
if
(
efuse_pg_packet_read
(
hw
,
tmp_pkt
.
offset
,
originaldata
))
{
if
(
efuse_pg_packet_read
(
hw
,
tmp_pkt
.
offset
,
originaldata
))
{
badworden
=
efuse_word_enable_data_write
(
hw
,
badworden
=
efuse_word_enable_data_write
(
hw
,
...
@@ -917,7 +916,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
...
@@ -917,7 +916,7 @@ static int efuse_pg_packet_write(struct ieee80211_hw *hw,
target_pkt
.
offset
=
offset
;
target_pkt
.
offset
=
offset
;
target_pkt
.
word_en
=
word_en
;
target_pkt
.
word_en
=
word_en
;
memset
(
(
void
*
)
target_pkt
.
data
,
8
*
sizeof
(
u8
),
0xFF
);
memset
(
target_pkt
.
data
,
0xFF
,
8
*
sizeof
(
u8
)
);
efuse_word_enable_data_read
(
word_en
,
data
,
target_pkt
.
data
);
efuse_word_enable_data_read
(
word_en
,
data
,
target_pkt
.
data
);
target_word_cnts
=
efuse_calculate_word_cnts
(
target_pkt
.
word_en
);
target_word_cnts
=
efuse_calculate_word_cnts
(
target_pkt
.
word_en
);
...
@@ -1022,7 +1021,7 @@ static u8 efuse_word_enable_data_write(struct ieee80211_hw *hw,
...
@@ -1022,7 +1021,7 @@ static u8 efuse_word_enable_data_write(struct ieee80211_hw *hw,
u8
badworden
=
0x0F
;
u8
badworden
=
0x0F
;
u8
tmpdata
[
8
];
u8
tmpdata
[
8
];
memset
(
(
void
*
)
tmpdata
,
PGPKT_DATA_SIZE
,
0xff
);
memset
(
tmpdata
,
0xff
,
PGPKT_DATA_SIZE
);
RT_TRACE
(
rtlpriv
,
COMP_EFUSE
,
DBG_LOUD
,
RT_TRACE
(
rtlpriv
,
COMP_EFUSE
,
DBG_LOUD
,
(
"word_en = %x efuse_addr=%x
\n
"
,
word_en
,
efuse_addr
));
(
"word_en = %x efuse_addr=%x
\n
"
,
word_en
,
efuse_addr
));
...
...
drivers/net/wireless/zd1211rw/zd_usb.c
View file @
db138908
...
@@ -60,6 +60,7 @@ static struct usb_device_id usb_ids[] = {
...
@@ -60,6 +60,7 @@ static struct usb_device_id usb_ids[] = {
{
USB_DEVICE
(
0x157e
,
0x300a
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x157e
,
0x300a
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x157e
,
0x300b
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x157e
,
0x300b
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x157e
,
0x3204
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x157e
,
0x3204
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x157e
,
0x3207
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x1740
,
0x2000
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x1740
,
0x2000
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x6891
,
0xa727
),
.
driver_info
=
DEVICE_ZD1211
},
{
USB_DEVICE
(
0x6891
,
0xa727
),
.
driver_info
=
DEVICE_ZD1211
},
/* ZD1211B */
/* ZD1211B */
...
...
include/net/cfg80211.h
View file @
db138908
...
@@ -486,7 +486,8 @@ struct rate_info {
...
@@ -486,7 +486,8 @@ struct rate_info {
* @plink_state: mesh peer link state
* @plink_state: mesh peer link state
* @signal: signal strength of last received packet in dBm
* @signal: signal strength of last received packet in dBm
* @signal_avg: signal strength average in dBm
* @signal_avg: signal strength average in dBm
* @txrate: current unicast bitrate to this station
* @txrate: current unicast bitrate from this station
* @rxrate: current unicast bitrate to this station
* @rx_packets: packets received from this station
* @rx_packets: packets received from this station
* @tx_packets: packets transmitted to this station
* @tx_packets: packets transmitted to this station
* @tx_retries: cumulative retry counts
* @tx_retries: cumulative retry counts
...
...
include/net/mac80211.h
View file @
db138908
...
@@ -1160,7 +1160,7 @@ enum ieee80211_hw_flags {
...
@@ -1160,7 +1160,7 @@ enum ieee80211_hw_flags {
* @napi_weight: weight used for NAPI polling. You must specify an
* @napi_weight: weight used for NAPI polling. You must specify an
* appropriate value here if a napi_poll operation is provided
* appropriate value here if a napi_poll operation is provided
* by your driver.
* by your driver.
*
* @max_rx_aggregation_subframes: maximum buffer size (number of
* @max_rx_aggregation_subframes: maximum buffer size (number of
* sub-frames) to be used for A-MPDU block ack receiver
* sub-frames) to be used for A-MPDU block ack receiver
* aggregation.
* aggregation.
...
...
net/mac80211/sta_info.c
View file @
db138908
...
@@ -243,6 +243,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
...
@@ -243,6 +243,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
memcpy
(
sta
->
sta
.
addr
,
addr
,
ETH_ALEN
);
memcpy
(
sta
->
sta
.
addr
,
addr
,
ETH_ALEN
);
sta
->
local
=
local
;
sta
->
local
=
local
;
sta
->
sdata
=
sdata
;
sta
->
sdata
=
sdata
;
sta
->
last_rx
=
jiffies
;
ewma_init
(
&
sta
->
avg_signal
,
1024
,
8
);
ewma_init
(
&
sta
->
avg_signal
,
1024
,
8
);
...
...
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