Merge header file changes from net-2.6.25

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
4 files changed