aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/ip.h2
-rw-r--r--net/core/netpoll.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/net/ip.h b/include/net/ip.h
index 412e8114667d..eafbcaf728fd 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -135,7 +135,7 @@ static inline void ip_tr_mc_map(__be32 addr, char *buf)
135 135
136struct ip_reply_arg { 136struct ip_reply_arg {
137 struct kvec iov[1]; 137 struct kvec iov[1];
138 u32 csum; 138 __wsum csum;
139 int csumoffset; /* u16 offset of csum in iov[0].iov_base */ 139 int csumoffset; /* u16 offset of csum in iov[0].iov_base */
140 /* -1 if not needed */ 140 /* -1 if not needed */
141}; 141};
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index edd3246873e8..26ee1791aa02 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -78,9 +78,9 @@ static void queue_process(void *p)
78} 78}
79 79
80static int checksum_udp(struct sk_buff *skb, struct udphdr *uh, 80static int checksum_udp(struct sk_buff *skb, struct udphdr *uh,
81 unsigned short ulen, u32 saddr, u32 daddr) 81 unsigned short ulen, __be32 saddr, __be32 daddr)
82{ 82{
83 unsigned int psum; 83 __wsum psum;
84 84
85 if (uh->check == 0 || skb->ip_summed == CHECKSUM_UNNECESSARY) 85 if (uh->check == 0 || skb->ip_summed == CHECKSUM_UNNECESSARY)
86 return 0; 86 return 0;