summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2014-01-15 11:59:16 +0000
committerPatrick McHardy <kaber@trash.net>2014-01-15 11:59:16 +0000
commit75d2e1e6e90b087ea48f0cf0ea23a8a566d94537 (patch)
tree9657cda840f5446cbff6ada42cee63930fb3aa4d
parentd232d30da84b333ca668e61d4cbcafe8dbc34ade (diff)
parentd5e4f94cf130c79758d285ad88f4bd10674e409e (diff)
Merge branch 'master' into next-3.14
Signed-off-by: Patrick McHardy <kaber@trash.net> Conflicts: src/payload.c
-rw-r--r--src/proto.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/proto.c b/src/proto.c
index 56fb7930..4d4925b0 100644
--- a/src/proto.c
+++ b/src/proto.c
@@ -787,7 +787,7 @@ const struct datatype ethertype_type = {
ETHHDR_TEMPLATE(__name, &etheraddr_type, __member)
const struct proto_desc proto_eth = {
- .name = "eth",
+ .name = "ether",
.base = PROTO_BASE_LL_HDR,
.protocol_key = ETHHDR_TYPE,
.protocols = {