Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 6787
b: refs/heads/master
c: 8d45ff7
h: refs/heads/master
i:
  6785: 03dfab4
  6783: 9ffc87e
v: v3
  • Loading branch information
Jiri Benc authored and Jeff Garzik committed Aug 26, 2005
1 parent 5588d6c commit 095b8d2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 11 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: 771abed990d8642f289f733dc0fa8a395ab31ca1
refs/heads/master: 8d45ff7d7bd85d9066f5b498cda5c4a52ac36a7f
2 changes: 1 addition & 1 deletion trunk/drivers/net/wireless/ipw2200.c
Original file line number Diff line number Diff line change
Expand Up @@ -4485,7 +4485,7 @@ static void ipw_debug_config(struct ipw_priv *priv)
IPW_DEBUG_INFO("RATE MASK: 0x%08X\n", priv->rates_mask);
}
#else
#define ipw_debug_config(x) do {} while (0);
#define ipw_debug_config(x) do {} while (0)
#endif

static inline void ipw_set_fixed_rate(struct ipw_priv *priv,
Expand Down
10 changes: 1 addition & 9 deletions trunk/drivers/net/wireless/ipw2200.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ enum connection_manager_assoc_states
};


#define IPW_NORMAL 0
#define IPW_NOWAIT 0
#define IPW_WAIT (1<<0)
#define IPW_QUIET (1<<1)
#define IPW_ROAMING (1<<2)
Expand Down Expand Up @@ -180,7 +178,7 @@ enum connection_manager_assoc_states

/* even if MAC WEP set (allows pre-encrypt) */
#define DCT_FLAG_NO_WEP 0x20
#define IPW_

/* overwrite TSF field */
#define DCT_FLAG_TSF_REQD 0x40

Expand Down Expand Up @@ -513,12 +511,6 @@ struct notif_authenticate {
u16 status;
} __attribute__ ((packed));

struct temperature
{
s32 measured;
s32 active;
} __attribute__ ((packed));

struct notif_calibration {
u8 data[104];
} __attribute__ ((packed));
Expand Down

0 comments on commit 095b8d2

Please sign in to comment.