From mboxrd@z Thu Jan  1 00:00:00 1970
From: Eric Dumazet <eric.dumazet@gmail.com>
Subject: Re: [PATCH] 1/1 net: packet: Keep 802.1Q VLAN tag in packet on SOCK_DGRAM
 socket - resend
Date: Mon, 04 Jan 2010 11:36:50 +0100
Message-ID: <4B41C4C2.3030404@gmail.com>
References: <001801ca8d1d$90c68de0$b253a9a0$@name>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE
Cc: kaber@trash.net, uaca@alumni.uv.es, johann.baudy@gnu-log.net,
	linux-kernel@vger.kernel.org, netdev@vger.kernel.org
To: Milan Dadok <milan@dadok.name>
Return-path: <netdev-owner@vger.kernel.org>
Received: from gw1.cosmosbay.com ([212.99.114.194]:42449 "EHLO
	gw1.cosmosbay.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752471Ab0ADKkG (ORCPT
	<rfc822;netdev@vger.kernel.org>); Mon, 4 Jan 2010 05:40:06 -0500
In-Reply-To: <001801ca8d1d$90c68de0$b253a9a0$@name>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

Le 04/01/2010 10:09, Milan Dadok a =E9crit :
> Keep 802.1Q VLAN tag on non HW vlan accelerated network card received=
 to SOCK_DGRAM socket.
>=20
> Signed-off-by: Milan Dadok <milan@dadok.name>
>=20
> ---
> diff -urN af_packet.c.orig af_packet.c
> --- af_packet.c.orig    2009-12-26 12:34:15.000000000 +0100
> +++ af_packet.c 2009-12-28 14:31:14.000000000 +0100
> @@ -57,6 +57,8 @@
>  #include <linux/inet.h>
>  #include <linux/netdevice.h>
>  #include <linux/if_packet.h>
> +#include <linux/if_vlan.h>
> +#include "../8021q/vlan.h"

This is ugly, please move is_vlan_dev() in if_vlan.h instead ?

>  #include <linux/wireless.h>
>  #include <linux/kernel.h>
>  #include <linux/kmod.h>
> @@ -680,8 +682,28 @@
>                 if (sk->sk_type !=3D SOCK_DGRAM)
>                         skb_push(skb, skb->data - skb_mac_header(skb)=
);
>                 else if (skb->pkt_type =3D=3D PACKET_OUTGOING) {
> -                       /* Special case: outgoing packets have ll hea=
der at head */
> -                       skb_pull(skb, skb_network_offset(skb));
> +                       /* Special case: outgoing packets have ll hea=
der at head
> +                        * but we must leave 802.1Q encapsulation etc=
=2E (only for non HW vlan accelerated)
> +                        * encasulation len =3D actual header_len min=
us hard_header_len
> +                        * packet outgoing from vlan1@eth0 on eth0 ha=
ve skb_network_offset=3D18, hard_header_len=3D14
> +                        */
> +                       int hard_header_len;
> +                       struct net_device *pdev;
> +                       hard_header_len =3D dev->hard_header_len;
> +                       pdev =3D dev;
> +                       /* if dev is vlan device, hard_header_len con=
tains 802.1Q encap, subtract it, recursively
> +                        * ie. vlan3@vlan2@vlan1@eth0
> +                        */
> +                       while (is_vlan_dev(pdev)) {
> +                               struct net_device *real_dev =3D vlan_=
dev_info(pdev)->real_dev;
A new line after variable definition is welcomed.
> +                               hard_header_len -=3D pdev->hard_heade=
r_len - real_dev->hard_header_len;
> +                               pdev =3D real_dev;
> +                       }
> +
> +                       skb_pull(skb, skb_network_offset(skb) -
> +                            (skb_network_offset(skb) - hard_header_l=
en>0 ? skb_network_offset(skb) - hard_header_len : 0));
>                 }
>         }

I find this logic a bit hard to read, you might use this instead :

if (skb_network_offset(skb) > hard_header_len)
	skb_pull(skb, hard_header_len);
else
	skb_pull(skb, skb_network_offset(skb));




Also, could you please read Documentation/SubmittingPatches and
Documentation/email-clients.txt

Your patch has at least two problems :

1) It is not an unified diff
2) It has garbled tabulations (they are replaced by spaces)

It is not applicable as is.

Thank you