1 files changed, 12 insertions, 17 deletions

diff --git a/drivers/s390/net/lcs.h b/drivers/s390/net/lcs.h
index 93143932983b..0e1e4a0a88f0 100644
--- a/drivers/s390/net/lcs.h
+++ b/drivers/s390/net/lcs.h
@@ -23,11 +23,6 @@ do {                                       \
 } while (0)
 
 /**
- * some more definitions for debug or output stuff
- */
-#define PRINTK_HEADER           " lcs: "
-
-/**
  *      sysfs related stuff
  */
 #define CARD_FROM_DEV(cdev) \
@@ -127,22 +122,22 @@ do {                                       \
  * LCS Buffer states
  */
 enum lcs_buffer_states {
-        BUF_STATE_EMPTY,        /* buffer is empty */
-        BUF_STATE_LOCKED,       /* buffer is locked, don't touch */
-        BUF_STATE_READY,        /* buffer is ready for read/write */
-        BUF_STATE_PROCESSED,
+        LCS_BUF_STATE_EMPTY,    /* buffer is empty */
+        LCS_BUF_STATE_LOCKED,   /* buffer is locked, don't touch */
+        LCS_BUF_STATE_READY,    /* buffer is ready for read/write */
+        LCS_BUF_STATE_PROCESSED,
 };
 
 /**
  * LCS Channel State Machine declarations
  */
 enum lcs_channel_states {
-        CH_STATE_INIT,
-        CH_STATE_HALTED,
-        CH_STATE_STOPPED,
-        CH_STATE_RUNNING,
-        CH_STATE_SUSPENDED,
-        CH_STATE_CLEARED,
+        LCS_CH_STATE_INIT,
+        LCS_CH_STATE_HALTED,
+        LCS_CH_STATE_STOPPED,
+        LCS_CH_STATE_RUNNING,
+        LCS_CH_STATE_SUSPENDED,
+        LCS_CH_STATE_CLEARED,
 };
 
 /**
@@ -169,7 +164,7 @@ struct lcs_header {
 }  __attribute__ ((packed));
 
 struct lcs_ip_mac_pair {
-        __u32  ip_addr;
+        __be32  ip_addr;
         __u8   mac_addr[LCS_MAC_LENGTH];
         __u8   reserved[2];
 }  __attribute__ ((packed));
@@ -287,7 +282,7 @@ struct lcs_card {
         enum lcs_dev_states state;
         struct net_device *dev;
         struct net_device_stats stats;
-        unsigned short (*lan_type_trans)(struct sk_buff *skb,
+        __be16 (*lan_type_trans)(struct sk_buff *skb,
                                          struct net_device *dev);
         struct ccwgroup_device *gdev;
         struct lcs_channel read;