From: David S. Miller <davem@davemloft.net>
Date: Wed, 18 Dec 2013 05:36:51 +0000 (-0500)
Subject: Merge branch 'vlan_tpid'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a58f7f8a6196f22ed47181512e53329a586f10f8;p=linux-beck.git

Merge branch 'vlan_tpid'

Atzm Watanabe says:

====================
packet: deliver VLAN TPID to userspace

This patchset enables userspace to get VLAN TPID as well as the VLAN TCI.

After the 802.1AD support, userspace packet receivers (packet dumper,
software switch, and the like) need how to know VLAN TPID in order to
reconstruct original tagged frame.

v4: Simply use sizeof(tp_padding) for zeroing the padding bytes,
    commented by David Laight.
    Use __u16 for tp_vlan_tpid in tpacket_hdr_variant1,
    commented by Daniel Borkmann.

v3: Add a definition which indicates whether tp_vlan_tpid is valid.
    Explicitly define pad bytes for tpacket{2,3}_hdr and pick the area
    for tp_vlan_tpid from the definition.  Commented by David Laight.

v2: Add BUILD_BUG_ON() to make current aligned size of
    struct tpacket{2,3}_hdr clear.  Commented by Ben Hutchings.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

a58f7f8a6196f22ed47181512e53329a586f10f8