From 7384516f026bd33c5682445f14bda1a537f43ee0 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Sun, 17 Sep 2006 23:59:57 -0700 Subject: [PATCH] --- yaml --- r: 33975 b: refs/heads/master c: cbe21d8fefca605b90e34f0f019505e599712f9b h: refs/heads/master i: 33973: 434f0349bb2f918b121ca0147a150ea77ea13978 33971: e250ff20423c5e05aa601946dc584627c4e48bde 33967: c15be41e92b64331e1ea39617d5990bbcf2e2ef2 v: v3 --- [refs] | 2 +- trunk/net/packet/af_packet.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 22f111b12d95..7b93d3541f59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 080f22c0dc544e498e57ad281a9de063fa839957 +refs/heads/master: cbe21d8fefca605b90e34f0f019505e599712f9b diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c index f9cef3671593..4172a5235916 100644 --- a/trunk/net/packet/af_packet.c +++ b/trunk/net/packet/af_packet.c @@ -626,8 +626,6 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe if ((int)snaplen < 0) snaplen = 0; } - if (snaplen > skb->len-skb->data_len) - snaplen = skb->len-skb->data_len; spin_lock(&sk->sk_receive_queue.lock); h = (struct tpacket_hdr *)packet_lookup_frame(po, po->head); @@ -644,7 +642,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe status &= ~TP_STATUS_LOSING; spin_unlock(&sk->sk_receive_queue.lock); - memcpy((u8*)h + macoff, skb->data, snaplen); + skb_copy_bits(skb, 0, (u8*)h + macoff, snaplen); h->tp_len = skb->len; h->tp_snaplen = snaplen;