Merge branch 'mainstream'

[sliver-openvswitch.git] / datapath / linux / compat / include / linux / netdevice.h

diff --git a/datapath/linux/compat/include/linux/netdevice.h b/datapath/linux/compat/include/linux/netdevice.h
index f62bd6d..2ceff22 100644 (file)
--- a/datapath/linux/compat/include/linux/netdevice.h
+++ b/datapath/linux/compat/include/linux/netdevice.h
@@ -98,7 +98,7 @@ static inline int netdev_rx_handler_register(struct net_device *dev,
 #ifdef HAVE_RHEL_OVS_HOOK
        rcu_assign_pointer(dev->ax25_ptr, rx_handler_data);
        nr_bridges++;
-       rcu_assign_pointer(openvswitch_handle_frame_hook, rx_handler_data);
+       rcu_assign_pointer(openvswitch_handle_frame_hook, rx_handler);
 #else
        if (dev->br_port)
                return -EBUSY;