Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / drivers / net / can / usb / peak_usb / pcan_usb_pro.h

diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_pro.h b/drivers/net/can/usb/peak_usb/pcan_usb_pro.h
index 32275af..837cee2 100644 (file)
--- a/drivers/net/can/usb/peak_usb/pcan_usb_pro.h
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_pro.h
@@ -33,27 +33,27 @@
 
 /* PCAN_USBPRO_INFO_BL vendor request record type */
 struct __packed pcan_usb_pro_blinfo {
-       u32 ctrl_type;
+       __le32 ctrl_type;
        u8  version[4];
        u8  day;
        u8  month;
        u8  year;
        u8  dummy;
-       u32 serial_num_hi;
-       u32 serial_num_lo;
-       u32 hw_type;
-       u32 hw_rev;
+       __le32 serial_num_hi;
+       __le32 serial_num_lo;
+       __le32 hw_type;
+       __le32 hw_rev;
 };
 
 /* PCAN_USBPRO_INFO_FW vendor request record type */
 struct __packed pcan_usb_pro_fwinfo {
-       u32 ctrl_type;
+       __le32 ctrl_type;
        u8  version[4];
        u8  day;
        u8  month;
        u8  year;
        u8  dummy;
-       u32 fw_type;
+       __le32 fw_type;
 };
 
 /*
@@ -80,46 +80,46 @@ struct __packed pcan_usb_pro_fwinfo {
 struct __packed pcan_usb_pro_btr {
        u8  data_type;
        u8  channel;
-       u16 dummy;
-       u32 CCBT;
+       __le16 dummy;
+       __le32 CCBT;
 };
 
 struct __packed pcan_usb_pro_busact {
        u8  data_type;
        u8  channel;
-       u16 onoff;
+       __le16 onoff;
 };
 
 struct __packed pcan_usb_pro_silent {
        u8  data_type;
        u8  channel;
-       u16 onoff;
+       __le16 onoff;
 };
 
 struct __packed pcan_usb_pro_filter {
        u8  data_type;
        u8  dummy;
-       u16 filter_mode;
+       __le16 filter_mode;
 };
 
 struct __packed pcan_usb_pro_setts {
        u8  data_type;
        u8  dummy;
-       u16 mode;
+       __le16 mode;
 };
 
 struct __packed pcan_usb_pro_devid {
        u8  data_type;
        u8  channel;
-       u16 dummy;
-       u32 serial_num;
+       __le16 dummy;
+       __le32 serial_num;
 };
 
 struct __packed pcan_usb_pro_setled {
        u8  data_type;
        u8  channel;
-       u16 mode;
-       u32 timeout;
+       __le16 mode;
+       __le32 timeout;
 };
 
 struct __packed pcan_usb_pro_rxmsg {
@@ -127,8 +127,8 @@ struct __packed pcan_usb_pro_rxmsg {
        u8  client;
        u8  flags;
        u8  len;
-       u32 ts32;
-       u32 id;
+       __le32 ts32;
+       __le32 id;
 
        u8  data[8];
 };
@@ -141,15 +141,15 @@ struct __packed pcan_usb_pro_rxmsg {
 struct __packed pcan_usb_pro_rxstatus {
        u8  data_type;
        u8  channel;
-       u16 status;
-       u32 ts32;
-       u32 err_frm;
+       __le16 status;
+       __le32 ts32;
+       __le32 err_frm;
 };
 
 struct __packed pcan_usb_pro_rxts {
        u8  data_type;
        u8  dummy[3];
-       u32 ts64[2];
+       __le32 ts64[2];
 };
 
 struct __packed pcan_usb_pro_txmsg {
@@ -157,7 +157,7 @@ struct __packed pcan_usb_pro_txmsg {
        u8  client;
        u8  flags;
        u8  len;
-       u32 id;
+       __le32 id;
        u8  data[8];
 };