From 5a277cede7bebdad88642a95b88d46a97dcb2b91 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 9 Feb 2007 16:40:15 +0000
Subject: [PATCH] --- yaml --- r: 47276 b: refs/heads/master c:
 bd4f3ae1a1524114f7a8051214bacea2fe7813b8 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/s2io.c | 2 +-
 trunk/drivers/net/s2io.h | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7a59d8c602c2..47631ad17a80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b53449725a9a436fb9cc2f2ef8579368a704db03
+refs/heads/master: bd4f3ae1a1524114f7a8051214bacea2fe7813b8
diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c
index 639fbc0f16f3..8646b64994ab 100644
--- a/trunk/drivers/net/s2io.c
+++ b/trunk/drivers/net/s2io.c
@@ -7298,7 +7298,7 @@ static void update_L3L4_header(struct s2io_nic *sp, struct lro *lro)
 {
 	struct iphdr *ip = lro->iph;
 	struct tcphdr *tcp = lro->tcph;
-	u16 nchk;
+	__sum16 nchk;
 	struct stat_block *statinfo = sp->mac_control.stats_info;
 	DBG_PRINT(INFO_DBG,"%s: Been here...\n", __FUNCTION__);
 
diff --git a/trunk/drivers/net/s2io.h b/trunk/drivers/net/s2io.h
index a5e1a513deb5..0de0c65f945a 100644
--- a/trunk/drivers/net/s2io.h
+++ b/trunk/drivers/net/s2io.h
@@ -727,12 +727,12 @@ struct lro {
 	struct iphdr	*iph;
 	struct tcphdr	*tcph;
 	u32		tcp_next_seq;
-	u32		tcp_ack;
+	__be32		tcp_ack;
 	int		total_len;
 	int		frags_len;
 	int		sg_num;
 	int		in_use;
-	u16		window;
+	__be16		window;
 	u32		cur_tsval;
 	u32		cur_tsecr;
 	u8		saw_ts;
@@ -1005,7 +1005,7 @@ static int s2io_set_swapper(struct s2io_nic * sp);
 static void s2io_card_down(struct s2io_nic *nic);
 static int s2io_card_up(struct s2io_nic *nic);
 static int get_xena_rev_id(struct pci_dev *pdev);
-static int wait_for_cmd_complete(void *addr, u64 busy_bit);
+static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit);
 static int s2io_add_isr(struct s2io_nic * sp);
 static void s2io_rem_isr(struct s2io_nic * sp);