git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mlx5-updates-2018-05-17' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
wireless
/
mediatek
/
mt76
/
mt76x2.h
diff --git
a/drivers/net/wireless/mediatek/mt76/mt76x2.h
b/drivers/net/wireless/mediatek/mt76/mt76x2.h
index 783b8122ec3c9b0121029bf5f294ae45f794ac70..a5d1255e4b9c8319d583043ea67a756fd3843d8f 100644
(file)
--- a/
drivers/net/wireless/mediatek/mt76/mt76x2.h
+++ b/
drivers/net/wireless/mediatek/mt76/mt76x2.h
@@
-117,7
+117,6
@@
struct mt76x2_dev {
u8 beacon_mask;
u8 beacon_data_mask;
u8 beacon_mask;
u8 beacon_data_mask;
- u32 rev;
u32 rxfilter;
u16 chainmask;
u32 rxfilter;
u16 chainmask;
@@
-151,7
+150,7
@@
struct mt76x2_sta {
static inline bool is_mt7612(struct mt76x2_dev *dev)
{
static inline bool is_mt7612(struct mt76x2_dev *dev)
{
- return
(dev->rev >> 1
6) == 0x7612;
+ return
mt76_chip(&dev->mt7
6) == 0x7612;
}
void mt76x2_set_irq_mask(struct mt76x2_dev *dev, u32 clear, u32 set);
}
void mt76x2_set_irq_mask(struct mt76x2_dev *dev, u32 clear, u32 set);