diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
| commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
| tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /drivers/s390/net/lcs.h | |
| parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
| parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) | |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'drivers/s390/net/lcs.h')
| -rw-r--r-- | drivers/s390/net/lcs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/net/lcs.h b/drivers/s390/net/lcs.h index 93143932983b..b5247dc08b57 100644 --- a/drivers/s390/net/lcs.h +++ b/drivers/s390/net/lcs.h | |||
| @@ -169,7 +169,7 @@ struct lcs_header { | |||
| 169 | } __attribute__ ((packed)); | 169 | } __attribute__ ((packed)); |
| 170 | 170 | ||
| 171 | struct lcs_ip_mac_pair { | 171 | struct lcs_ip_mac_pair { |
| 172 | __u32 ip_addr; | 172 | __be32 ip_addr; |
| 173 | __u8 mac_addr[LCS_MAC_LENGTH]; | 173 | __u8 mac_addr[LCS_MAC_LENGTH]; |
| 174 | __u8 reserved[2]; | 174 | __u8 reserved[2]; |
| 175 | } __attribute__ ((packed)); | 175 | } __attribute__ ((packed)); |
| @@ -287,7 +287,7 @@ struct lcs_card { | |||
| 287 | enum lcs_dev_states state; | 287 | enum lcs_dev_states state; |
| 288 | struct net_device *dev; | 288 | struct net_device *dev; |
| 289 | struct net_device_stats stats; | 289 | struct net_device_stats stats; |
| 290 | unsigned short (*lan_type_trans)(struct sk_buff *skb, | 290 | __be16 (*lan_type_trans)(struct sk_buff *skb, |
| 291 | struct net_device *dev); | 291 | struct net_device *dev); |
| 292 | struct ccwgroup_device *gdev; | 292 | struct ccwgroup_device *gdev; |
| 293 | struct lcs_channel read; | 293 | struct lcs_channel read; |