- Don't forget to reset the M_VLANTAG when removing a tag,   otherwise bad things may happen.  [1]
- Don't forget to reset the M_VLANTAG when removing a tag,
  otherwise bad things may happen.  [1]

- More diff redux to HEAD.

Submitted by:	Vsevolod Lobko [1]

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase