[PATCH] trivial s2io annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 639fbc0f16f3f8d8d1832d3bfca7ce436433e784..8646b64994abadee6b2e38bcf0b7fe4209d1d6da 100644 (file)
--- a/drivers/net/s2io.c
+++ b/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/drivers/net/s2io.h b/drivers/net/s2io.h
index a5e1a513deb53039d1ac97e0514d3fe940bd382d..0de0c65f945aba87f90760557adca24bb49173ed 100644 (file)
--- a/drivers/net/s2io.h
+++ b/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);