More painful merges...

[David Miller]

BPF and tc action bug fixes in 'net' caused some extremely
painful merges with 'net-next'.

Could the interested parties please take a look at 'net-next'
and send me any necessary fixes, as I did the best that I
could.

Thank you.