Subject: Re: [patch net-next-2.6 1/8] af_packet: use skb->skb_iif instead of orig_dev->ifindex

From: Nicolas de Pesloüan<[email-masked]>
Date: Sat, 05 Mar 2011 15:03:40 +0100

Le 05/03/2011 11:29, Jiri Pirko a écrit :
> Since skb_iif has the desired value (ifindex of physical device actually
> received the traffic) use that instead.

This one cause orig_dev to be useless from the af_packet point of view, which is really good.

>
> Signed-off-by: Jiri Pirko<[email-masked]>

Reviewed-by: Nicolas de Pesloüan <[email-masked]>

> ---
>   net/packet/af_packet.c |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
> index 5efef5b..b34294e 100644
> --- a/net/packet/af_packet.c
> +++ b/net/packet/af_packet.c
> @@ -627,7 +627,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
>   	sll->sll_protocol = skb->protocol;
>   	sll->sll_pkttype = skb->pkt_type;
>   	if (unlikely(po->origdev))
> -		sll->sll_ifindex = orig_dev->ifindex;
> +		sll->sll_ifindex = skb->skb_iif;
>   	else
>   		sll->sll_ifindex = dev->ifindex;
>
> @@ -812,7 +812,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,
>   	sll->sll_protocol = skb->protocol;
>   	sll->sll_pkttype = skb->pkt_type;
>   	if (unlikely(po->origdev))
> -		sll->sll_ifindex = orig_dev->ifindex;
> +		sll->sll_ifindex = skb->skb_iif;
>   	else
>   		sll->sll_ifindex = dev->ifindex;
>