diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-31 11:25:51 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-31 11:25:51 +1100 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /drivers/net/wireless/wavelan_cs.p.h | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/net/wireless/wavelan_cs.p.h')
| -rw-r--r-- | drivers/net/wireless/wavelan_cs.p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h index 4b9de0093a7..33dd9709422 100644 --- a/drivers/net/wireless/wavelan_cs.p.h +++ b/drivers/net/wireless/wavelan_cs.p.h @@ -459,7 +459,6 @@ #undef WAVELAN_ROAMING_EXT /* Enable roaming wireless extensions */ #undef SET_PSA_CRC /* Set the CRC in PSA (slower) */ #define USE_PSA_CONFIG /* Use info from the PSA */ -#undef STRUCT_CHECK /* Verify padding of structures */ #undef EEPROM_IS_PROTECTED /* Doesn't seem to be necessary */ #define MULTICAST_AVOID /* Avoid extra multicast (I'm sceptical) */ #undef SET_MAC_ADDRESS /* Experimental */ @@ -548,7 +547,7 @@ typedef struct wavepoint_beacon spec_id2, /* Unused */ pdu_type, /* Unused */ seq; /* WavePoint beacon sequence number */ - unsigned short domain_id, /* WavePoint Domain ID */ + __be16 domain_id, /* WavePoint Domain ID */ nwid; /* WavePoint NWID */ } wavepoint_beacon; |