提交 65a45441 编写于 作者: S Stephen Hemminger 提交者: David S. Miller

[UDP]: udp_checksum_init return value

Since udp_checksum_init always returns 0 there is no point in
having it return a value.
Signed-off-by: NStephen Hemminger <shemminger@osdl.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 3305b80c
...@@ -1081,7 +1081,7 @@ static int udp_v4_mcast_deliver(struct sk_buff *skb, struct udphdr *uh, ...@@ -1081,7 +1081,7 @@ static int udp_v4_mcast_deliver(struct sk_buff *skb, struct udphdr *uh,
* Otherwise, csum completion requires chacksumming packet body, * Otherwise, csum completion requires chacksumming packet body,
* including udp header and folding it to skb->csum. * including udp header and folding it to skb->csum.
*/ */
static int udp_checksum_init(struct sk_buff *skb, struct udphdr *uh, static void udp_checksum_init(struct sk_buff *skb, struct udphdr *uh,
unsigned short ulen, u32 saddr, u32 daddr) unsigned short ulen, u32 saddr, u32 daddr)
{ {
if (uh->check == 0) { if (uh->check == 0) {
...@@ -1095,7 +1095,6 @@ static int udp_checksum_init(struct sk_buff *skb, struct udphdr *uh, ...@@ -1095,7 +1095,6 @@ static int udp_checksum_init(struct sk_buff *skb, struct udphdr *uh,
/* Probably, we should checksum udp header (it should be in cache /* Probably, we should checksum udp header (it should be in cache
* in any case) and data in tiny packets (< rx copybreak). * in any case) and data in tiny packets (< rx copybreak).
*/ */
return 0;
} }
/* /*
...@@ -1128,8 +1127,7 @@ int udp_rcv(struct sk_buff *skb) ...@@ -1128,8 +1127,7 @@ int udp_rcv(struct sk_buff *skb)
if (pskb_trim_rcsum(skb, ulen)) if (pskb_trim_rcsum(skb, ulen))
goto short_packet; goto short_packet;
if (udp_checksum_init(skb, uh, ulen, saddr, daddr) < 0) udp_checksum_init(skb, uh, ulen, saddr, daddr);
goto csum_error;
if(rt->rt_flags & (RTCF_BROADCAST|RTCF_MULTICAST)) if(rt->rt_flags & (RTCF_BROADCAST|RTCF_MULTICAST))
return udp_v4_mcast_deliver(skb, uh, saddr, daddr); return udp_v4_mcast_deliver(skb, uh, saddr, daddr);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册