use unsigned short for etherType
Merge remote-tracking branch 'origin/master'