/*
 * netsniff-ng - the packet sniffing beast
 * Copyright 2009, 2010 Daniel Borkmann.
 * Copyright 2010 Emmanuel Roullit.
 * Subject to the GPL, version 2.
 */

#include <stdio.h>
#include <stdint.h>
#include <netinet/in.h>    /* for ntohs() */

#include "proto.h"
#include "protos.h"
#include "dissector_eth.h"
#include "pkt_buff.h"

struct vlanhdr {
	uint16_t h_vlan_TCI;
	uint16_t h_vlan_encapsulated_proto;
} __attribute__((packed));

static void vlan(struct pkt_buff *pkt)
{
	uint16_t tci;
	struct vlanhdr *vlan = (struct vlanhdr *) pkt_pull(pkt, sizeof(*vlan));

	if (vlan == NULL)
		return;

	tci = ntohs(vlan->h_vlan_TCI);

	tprintf(" [ VLAN ");
	tprintf("Prio (%d), ", (tci & 0xE000) >> 13);
	tprintf("CFI (%d), ", (tci & 0x1000) >> 12);
	tprintf("ID (%d), ", (tci & 0x0FFF));
	tprintf("Proto (0x%.4x)", ntohs(vlan->h_vlan_encapsulated_proto));
	tprintf(" ]\n");

	pkt_set_proto(pkt, &eth_lay2, ntohs(vlan->h_vlan_encapsulated_proto));
}

static void vlan_less(struct pkt_buff *pkt)
{
	uint16_t tci;
	struct vlanhdr *vlan = (struct vlanhdr *) pkt_pull(pkt, sizeof(*vlan));

	if (vlan == NULL)
		return;

	tci = ntohs(vlan->h_vlan_TCI);

	tprintf(" VLAN%d", (tci & 0x0FFF));

	pkt_set_proto(pkt, &eth_lay2, ntohs(vlan->h_vlan_encapsulated_proto));
}

struct protocol vlan_ops = {
	.key = 0x8100,
	.print_full = vlan,
	.print_less = vlan_less,
};
alue='packet-rx-pump-back'>packet-rx-pump-back</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>net-next plumbings</td><td class='sub right'>Tobias Klauser</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit.cgi/linux/net-next.git/?h=nds-private-remove'>summary</a><a href='/cgit.cgi/linux/net-next.git/refs/?h=nds-private-remove&amp;id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>refs</a><a href='/cgit.cgi/linux/net-next.git/log/arch/arm/kernel/entry-armv.S?h=nds-private-remove'>log</a><a href='/cgit.cgi/linux/net-next.git/tree/arch/arm/kernel/entry-armv.S?h=nds-private-remove&amp;id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>tree</a><a class='active' href='/cgit.cgi/linux/net-next.git/commit/arch/arm/kernel/entry-armv.S?h=nds-private-remove&amp;id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>commit</a><a href='/cgit.cgi/linux/net-next.git/diff/arch/arm/kernel/entry-armv.S?h=nds-private-remove&amp;id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/arch/arm/kernel/entry-armv.S'>
<input type='hidden' name='h' value='nds-private-remove'/><input type='hidden' name='id' value='e2160156bf2a7d5018e99a9993fbcdda0abac09b'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit.cgi/linux/net-next.git/commit/?h=nds-private-remove&amp;id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>root</a>/<a href='/cgit.cgi/linux/net-next.git/commit/arch?h=nds-private-remove&amp;id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>arch</a>/<a href='/cgit.cgi/linux/net-next.git/commit/arch/arm?h=nds-private-remove&amp;id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>arm</a>/<a href='/cgit.cgi/linux/net-next.git/commit/arch/arm/kernel?h=nds-private-remove&amp;id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>kernel</a>/<a href='/cgit.cgi/linux/net-next.git/commit/arch/arm/kernel/entry-armv.S?h=nds-private-remove&amp;id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>entry-armv.S</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='nds-private-remove'/><input type='hidden' name='id' value='e2160156bf2a7d5018e99a9993fbcdda0abac09b'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>David S. Miller &lt;davem@davemloft.net&gt;</td><td class='right'>2017-02-02 16:54:00 -0500</td></tr>
<tr><th>committer</th><td>David S. Miller &lt;davem@davemloft.net&gt;</td><td class='right'>2017-02-02 16:54:00 -0500</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/arch/arm/kernel/entry-armv.S?h=nds-private-remove&amp;id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>e2160156bf2a7d5018e99a9993fbcdda0abac09b</a> (<a href='/cgit.cgi/linux/net-next.git/patch/arch/arm/kernel/entry-armv.S?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/tree/?h=nds-private-remove&amp;id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>1a70cb13dcfa7ade4c48d8a64d20543abebfb1dc</a> /<a href='/cgit.cgi/linux/net-next.git/tree/arch/arm/kernel/entry-armv.S?h=nds-private-remove&amp;id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>arch/arm/kernel/entry-armv.S</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/arch/arm/kernel/entry-armv.S?h=nds-private-remove&amp;id=62e13097c46c69dbd7544ab2cd585ccf48f360a4'>62e13097c46c69dbd7544ab2cd585ccf48f360a4</a> (<a href='/cgit.cgi/linux/net-next.git/diff/arch/arm/kernel/entry-armv.S?h=nds-private-remove&amp;id=e2160156bf2a7d5018e99a9993fbcdda0abac09b&amp;id2=62e13097c46c69dbd7544ab2cd585ccf48f360a4'>diff</a>)</td></tr><tr><th>parent</th><td colspan='2' class='oid'><a href='/cgit.cgi/linux/net-next.git/commit/arch/arm/kernel/entry-armv.S?h=nds-private-remove&amp;id=6d04dfc8966019b8b0977b2cb942351f13d2b178'>6d04dfc8966019b8b0977b2cb942351f13d2b178</a> (<a href='/cgit.cgi/linux/net-next.git/diff/arch/arm/kernel/entry-armv.S?h=nds-private-remove&amp;id=e2160156bf2a7d5018e99a9993fbcdda0abac09b&amp;id2=6d04dfc8966019b8b0977b2cb942351f13d2b178'>diff</a>)</td></tr></table>
<div class='commit-subject'>Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net</div><div class='commit-msg'>All merge conflicts were simple overlapping changes.

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
</div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?h=nds-private-remove&amp;id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>Diffstat</a> (limited to 'arch/arm/kernel/entry-armv.S')</div><table summary='diffstat' class='diffstat'>