diff options
| author | Patrick McHardy <kaber@trash.net> | 2014-01-16 17:22:56 +0000 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2014-01-16 17:22:56 +0000 |
| commit | 3b457d49854503807fa019d9c44a9daf6c79dba0 (patch) | |
| tree | 8c1b1e7a2443ac6cb1f1a4a561bf717cc1dd1246 /src/proto.c | |
| parent | d357cdd882cc0cf6afb15686834f5d9d6efab57f (diff) | |
| parent | 86b965bdab8dc8735c4a846ec09bfbbadfae780b (diff) | |
Merge remote-tracking branch 'origin/master' into next-3.14
Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
src/payload.c
Diffstat (limited to 'src/proto.c')
| -rw-r--r-- | src/proto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/proto.c b/src/proto.c index 4d4925b0..cc073af0 100644 --- a/src/proto.c +++ b/src/proto.c @@ -743,7 +743,7 @@ static const struct symbol_table ethertype_tbl = { .symbols = { SYMBOL("ip", ETH_P_IP), SYMBOL("arp", ETH_P_ARP), - SYMBOL("ipv6", ETH_P_IPV6), + SYMBOL("ip6", ETH_P_IPV6), SYMBOL("vlan", ETH_P_8021Q), SYMBOL_LIST_END }, |