diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-04-18 08:15:32 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-04-18 08:15:32 +0000 |
| commit | be31ffaeb0715ad7e786f145b6d15a9e2d5bdba7 (patch) | |
| tree | b9376ca23d0747428e6618ed192daddb47fc72c0 /wiretap | |
| parent | 323dd70e2b90ca4f5fee9c3492c72269ce343f1a (diff) | |
| download | wireshark-be31ffaeb0715ad7e786f145b6d15a9e2d5bdba7.tar.gz | |
Get the Windows build going again. The Netxray "fix" cast to guint8 may not be OK.
svn path=/trunk/; revision=42125
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/commview.c | 2 | ||||
| -rw-r--r-- | wiretap/netxray.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/commview.c b/wiretap/commview.c index 15d619b239..a2415fdcd7 100644 --- a/wiretap/commview.c +++ b/wiretap/commview.c @@ -59,7 +59,7 @@ typedef struct commview_header { guint32 usecs; guint8 flags; /* Bit-field positions defined below */ guint8 signal_level_percent; - guint8 rate; + guint16 rate; guint8 band; guint8 channel; guint8 direction; /* Or for WiFi, high order byte of diff --git a/wiretap/netxray.c b/wiretap/netxray.c index 231c877b7f..13178ba825 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -1739,7 +1739,7 @@ static gboolean netxray_dump_2_0(wtap_dumper *wdh, case WTAP_ENCAP_IEEE_802_11_WITH_RADIO: rec_hdr.xxx[12] = pseudo_header->ieee_802_11.channel; - rec_hdr.xxx[13] = pseudo_header->ieee_802_11.data_rate; + rec_hdr.xxx[13] = (guint8)pseudo_header->ieee_802_11.data_rate; rec_hdr.xxx[14] = pseudo_header->ieee_802_11.signal_level; break; |