From 9190f715b050342b461914d99e178159a0c0aa51 Mon Sep 17 00:00:00 2001 From: Peter P Waskiewicz Jr Date: Sat, 10 Nov 2007 22:03:25 -0800 Subject: [PATCH] --- yaml --- r: 73545 b: refs/heads/master c: 8032b46489e50ef8f3992159abd0349b5b8e476c h: refs/heads/master i: 73543: ba4083fe221653cc81961339cebf33c1a65a6947 v: v3 --- [refs] | 2 +- trunk/net/packet/af_packet.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b2bf8ea8e776..ac1502507612 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60d78c4473493674531a1df0772ca9e4d6133a62 +refs/heads/master: 8032b46489e50ef8f3992159abd0349b5b8e476c diff --git a/trunk/net/packet/af_packet.c b/trunk/net/packet/af_packet.c index 36331a5f0abe..eb6be5030c70 100644 --- a/trunk/net/packet/af_packet.c +++ b/trunk/net/packet/af_packet.c @@ -509,7 +509,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet sll->sll_hatype = dev->type; sll->sll_protocol = skb->protocol; sll->sll_pkttype = skb->pkt_type; - if (unlikely(po->origdev) && skb->pkt_type == PACKET_HOST) + if (unlikely(po->origdev)) sll->sll_ifindex = orig_dev->ifindex; else sll->sll_ifindex = dev->ifindex; @@ -655,7 +655,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe sll->sll_hatype = dev->type; sll->sll_protocol = skb->protocol; sll->sll_pkttype = skb->pkt_type; - if (unlikely(po->origdev) && skb->pkt_type == PACKET_HOST) + if (unlikely(po->origdev)) sll->sll_ifindex = orig_dev->ifindex; else sll->sll_ifindex = dev->ifindex;