aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-02-09 11:40:15 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 12:14:08 -0500
commitbd4f3ae1a1524114f7a8051214bacea2fe7813b8 (patch)
treefd596cff1db2fb3475717c3b06f6a16114121339 /drivers/net
parentb53449725a9a436fb9cc2f2ef8579368a704db03 (diff)
[PATCH] trivial s2io annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/s2io.c2
-rw-r--r--drivers/net/s2io.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 639fbc0f16f3..8646b64994ab 100644
--- 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)
7298{ 7298{
7299 struct iphdr *ip = lro->iph; 7299 struct iphdr *ip = lro->iph;
7300 struct tcphdr *tcp = lro->tcph; 7300 struct tcphdr *tcp = lro->tcph;
7301 u16 nchk; 7301 __sum16 nchk;
7302 struct stat_block *statinfo = sp->mac_control.stats_info; 7302 struct stat_block *statinfo = sp->mac_control.stats_info;
7303 DBG_PRINT(INFO_DBG,"%s: Been here...\n", __FUNCTION__); 7303 DBG_PRINT(INFO_DBG,"%s: Been here...\n", __FUNCTION__);
7304 7304
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index a5e1a513deb5..0de0c65f945a 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -727,12 +727,12 @@ struct lro {
727 struct iphdr *iph; 727 struct iphdr *iph;
728 struct tcphdr *tcph; 728 struct tcphdr *tcph;
729 u32 tcp_next_seq; 729 u32 tcp_next_seq;
730 u32 tcp_ack; 730 __be32 tcp_ack;
731 int total_len; 731 int total_len;
732 int frags_len; 732 int frags_len;
733 int sg_num; 733 int sg_num;
734 int in_use; 734 int in_use;
735 u16 window; 735 __be16 window;
736 u32 cur_tsval; 736 u32 cur_tsval;
737 u32 cur_tsecr; 737 u32 cur_tsecr;
738 u8 saw_ts; 738 u8 saw_ts;
@@ -1005,7 +1005,7 @@ static int s2io_set_swapper(struct s2io_nic * sp);
1005static void s2io_card_down(struct s2io_nic *nic); 1005static void s2io_card_down(struct s2io_nic *nic);
1006static int s2io_card_up(struct s2io_nic *nic); 1006static int s2io_card_up(struct s2io_nic *nic);
1007static int get_xena_rev_id(struct pci_dev *pdev); 1007static int get_xena_rev_id(struct pci_dev *pdev);
1008static int wait_for_cmd_complete(void *addr, u64 busy_bit); 1008static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit);
1009static int s2io_add_isr(struct s2io_nic * sp); 1009static int s2io_add_isr(struct s2io_nic * sp);
1010static void s2io_rem_isr(struct s2io_nic * sp); 1010static void s2io_rem_isr(struct s2io_nic * sp);
1011 1011