patch-2.4.27 linux-2.4.27/net/ipv6/raw.c
Next file: linux-2.4.27/net/ipv6/sit.c
Previous file: linux-2.4.27/net/ipv6/netfilter/ip6t_owner.c
Back to the patch index
Back to the overall index
- Lines: 32
- Date:
2004-08-07 16:26:07.060445640 -0700
- Orig file:
linux-2.4.26/net/ipv6/raw.c
- Orig date:
2003-11-28 10:26:21.000000000 -0800
diff -urN linux-2.4.26/net/ipv6/raw.c linux-2.4.27/net/ipv6/raw.c
@@ -279,8 +279,11 @@
static inline int rawv6_rcv_skb(struct sock * sk, struct sk_buff * skb)
{
+ if ((sk->tp_pinfo.tp_raw.checksum
#if defined(CONFIG_FILTER)
- if (sk->filter && skb->ip_summed != CHECKSUM_UNNECESSARY) {
+ || sk->filter
+#endif
+ ) && skb->ip_summed != CHECKSUM_UNNECESSARY) {
if ((unsigned short)csum_fold(skb_checksum(skb, 0, skb->len, skb->csum))) {
IP6_INC_STATS_BH(Ip6InDiscards);
kfree_skb(skb);
@@ -288,7 +291,6 @@
}
skb->ip_summed = CHECKSUM_UNNECESSARY;
}
-#endif
/* Charge it to the socket. */
if (sock_queue_rcv_skb(sk,skb)<0) {
IP6_INC_STATS_BH(Ip6InDiscards);
@@ -405,7 +407,10 @@
if (sk->net_pinfo.af_inet6.rxopt.all)
datagram_recv_ctl(sk, msg, skb);
+
err = copied;
+ if (flags & MSG_TRUNC)
+ err = skb->len;
out_free:
skb_free_datagram(sk, skb);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)