diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-06-09 23:34:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-15 14:47:11 -0400 |
commit | 93e2c32b5cb2ad92ceb1d7a4684f20a0d25bf530 (patch) | |
tree | c15af2642af01702097ade735506d15d7a910c54 /net/core | |
parent | 91d2c34a4eed32876ca333b0ca44f3bc56645805 (diff) |
net: add rx_handler data pointer
Add possibility to register rx_handler data pointer along with a rx_handler.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index a1abc10db08a..abdb19e547a7 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -2703,6 +2703,7 @@ void netif_nit_deliver(struct sk_buff *skb) | |||
2703 | * netdev_rx_handler_register - register receive handler | 2703 | * netdev_rx_handler_register - register receive handler |
2704 | * @dev: device to register a handler for | 2704 | * @dev: device to register a handler for |
2705 | * @rx_handler: receive handler to register | 2705 | * @rx_handler: receive handler to register |
2706 | * @rx_handler_data: data pointer that is used by rx handler | ||
2706 | * | 2707 | * |
2707 | * Register a receive hander for a device. This handler will then be | 2708 | * Register a receive hander for a device. This handler will then be |
2708 | * called from __netif_receive_skb. A negative errno code is returned | 2709 | * called from __netif_receive_skb. A negative errno code is returned |
@@ -2711,13 +2712,15 @@ void netif_nit_deliver(struct sk_buff *skb) | |||
2711 | * The caller must hold the rtnl_mutex. | 2712 | * The caller must hold the rtnl_mutex. |
2712 | */ | 2713 | */ |
2713 | int netdev_rx_handler_register(struct net_device *dev, | 2714 | int netdev_rx_handler_register(struct net_device *dev, |
2714 | rx_handler_func_t *rx_handler) | 2715 | rx_handler_func_t *rx_handler, |
2716 | void *rx_handler_data) | ||
2715 | { | 2717 | { |
2716 | ASSERT_RTNL(); | 2718 | ASSERT_RTNL(); |
2717 | 2719 | ||
2718 | if (dev->rx_handler) | 2720 | if (dev->rx_handler) |
2719 | return -EBUSY; | 2721 | return -EBUSY; |
2720 | 2722 | ||
2723 | rcu_assign_pointer(dev->rx_handler_data, rx_handler_data); | ||
2721 | rcu_assign_pointer(dev->rx_handler, rx_handler); | 2724 | rcu_assign_pointer(dev->rx_handler, rx_handler); |
2722 | 2725 | ||
2723 | return 0; | 2726 | return 0; |
@@ -2737,6 +2740,7 @@ void netdev_rx_handler_unregister(struct net_device *dev) | |||
2737 | 2740 | ||
2738 | ASSERT_RTNL(); | 2741 | ASSERT_RTNL(); |
2739 | rcu_assign_pointer(dev->rx_handler, NULL); | 2742 | rcu_assign_pointer(dev->rx_handler, NULL); |
2743 | rcu_assign_pointer(dev->rx_handler_data, NULL); | ||
2740 | } | 2744 | } |
2741 | EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister); | 2745 | EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister); |
2742 | 2746 | ||