Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 224307
b: refs/heads/master
c: fd8dab9
h: refs/heads/master
i:
  224305: 6fcd3bd
  224303: 5c7786c
v: v3
  • Loading branch information
Mark Einon authored and John W. Linville committed Nov 15, 2010
1 parent f391898 commit 7bbcd27
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cf553477a4dfb819c66ebfcad9f3b5cc3b93a9af
refs/heads/master: fd8dab9a67b22c35f38f0f5bfff4b3f6ed02e43a
22 changes: 11 additions & 11 deletions trunk/drivers/net/wireless/rt2x00/rt2800.h
Original file line number Diff line number Diff line change
Expand Up @@ -1508,17 +1508,17 @@
#define SHARED_KEY_MODE_BASE 0x7000

#define MAC_WCID_ENTRY(__idx) \
( MAC_WCID_BASE + ((__idx) * sizeof(struct mac_wcid_entry)) )
(MAC_WCID_BASE + ((__idx) * sizeof(struct mac_wcid_entry)))
#define PAIRWISE_KEY_ENTRY(__idx) \
( PAIRWISE_KEY_TABLE_BASE + ((__idx) * sizeof(struct hw_key_entry)) )
(PAIRWISE_KEY_TABLE_BASE + ((__idx) * sizeof(struct hw_key_entry)))
#define MAC_IVEIV_ENTRY(__idx) \
( MAC_IVEIV_TABLE_BASE + ((__idx) * sizeof(struct mac_iveiv_entry)) )
(MAC_IVEIV_TABLE_BASE + ((__idx) * sizeof(struct mac_iveiv_entry)))
#define MAC_WCID_ATTR_ENTRY(__idx) \
( MAC_WCID_ATTRIBUTE_BASE + ((__idx) * sizeof(u32)) )
(MAC_WCID_ATTRIBUTE_BASE + ((__idx) * sizeof(u32)))
#define SHARED_KEY_ENTRY(__idx) \
( SHARED_KEY_TABLE_BASE + ((__idx) * sizeof(struct hw_key_entry)) )
(SHARED_KEY_TABLE_BASE + ((__idx) * sizeof(struct hw_key_entry)))
#define SHARED_KEY_MODE_ENTRY(__idx) \
( SHARED_KEY_MODE_BASE + ((__idx) * sizeof(u32)) )
(SHARED_KEY_MODE_BASE + ((__idx) * sizeof(u32)))

struct mac_wcid_entry {
u8 mac[6];
Expand Down Expand Up @@ -1658,9 +1658,9 @@ struct mac_iveiv_entry {
#define HW_BEACON_BASE7 0x5bc0

#define HW_BEACON_OFFSET(__index) \
( ((__index) < 4) ? ( HW_BEACON_BASE0 + (__index * 0x0200) ) : \
(((__index) < 6) ? ( HW_BEACON_BASE4 + ((__index - 4) * 0x0200) ) : \
(HW_BEACON_BASE6 - ((__index - 6) * 0x0200))) )
(((__index) < 4) ? (HW_BEACON_BASE0 + (__index * 0x0200)) : \
(((__index) < 6) ? (HW_BEACON_BASE4 + ((__index - 4) * 0x0200)) : \
(HW_BEACON_BASE6 - ((__index - 6) * 0x0200))))

/*
* BBP registers.
Expand Down Expand Up @@ -2010,8 +2010,8 @@ struct mac_iveiv_entry {
/*
* DMA descriptor defines.
*/
#define TXWI_DESC_SIZE ( 4 * sizeof(__le32) )
#define RXWI_DESC_SIZE ( 4 * sizeof(__le32) )
#define TXWI_DESC_SIZE (4 * sizeof(__le32))
#define RXWI_DESC_SIZE (4 * sizeof(__le32))

/*
* TX WI structure
Expand Down

0 comments on commit 7bbcd27

Please sign in to comment.