datapath: use rx_handler_data pointer
authorSimon Horman <horms@verge.net.au>
Mon, 23 Aug 2010 06:30:10 +0000 (15:30 +0900)
committerJesse Gross <jesse@nicira.com>
Mon, 23 Aug 2010 18:37:44 +0000 (14:37 -0400)
commit37f055c758e2d74ee4abc1ebca94aa62700f3ca0
tree19ffb60554821942d56a0dbbd69059f51618ba79
parentf59a10a8b676546d120136e20445212c848e7c95
datapath: use rx_handler_data pointer

This adds compatibility with kernel changeset
"bridge: use rx_handler_data pointer to store net_bridge_port pointer"
which was added between 2.6.35 and 2.6.36-rc1.

With this change it is now safe to (attempt to) insert both bridge and
datapath with newer (>=2.6.36) kernels, although whichever is inserted
second will fail to initialise on the call to netdev_rx_handler_register()

Signed-off-by: Simon Horman <horms@verge.net.au>
[Jesse: fixed merge conflicts in vport-netdev.c and netdevice.h]
Signed-off-by: Jesse Gross <jesse@nicira.com>
datapath/linux-2.6/compat-2.6/include/linux/if.h
datapath/linux-2.6/compat-2.6/include/linux/netdevice.h
datapath/vport-netdev.c