leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: add rx_handler data pointer

Browse Source 
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>
This commit is contained in:
Jiri Pirko 2010-06-10 03:34:59 +00:00 committed by David S. Miller
parent 91d2c34a4e
commit 93e2c32b5c
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/macvlan.c
View File

@ -532,7 +532,7 @@ static int macvlan_port_create(struct net_device *dev)
INIT_HLIST_HEAD(&port->vlan_hash[i]);
rcu_assign_pointer(dev->macvlan_port, port);
err = netdev_rx_handler_register(dev, macvlan_handle_frame);
err = netdev_rx_handler_register(dev, macvlan_handle_frame, NULL);
if (err) {
rcu_assign_pointer(dev->macvlan_port, NULL);
kfree(port);

4
include/linux/netdevice.h
View File

@ -979,6 +979,7 @@ struct net_device {
struct netdev_queue rx_queue;
rx_handler_func_t *rx_handler;
void *rx_handler_data;
struct netdev_queue *_tx ____cacheline_aligned_in_smp;
@ -1712,7 +1713,8 @@ static inline void napi_free_frags(struct napi_struct *napi)
}
extern int netdev_rx_handler_register(struct net_device *dev,
rx_handler_func_t *rx_handler);
rx_handler_func_t *rx_handler,
void *rx_handler_data);
extern void netdev_rx_handler_unregister(struct net_device *dev);
extern void netif_nit_deliver(struct sk_buff *skb);

2
net/bridge/br_if.c
View File

@ -433,7 +433,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
rcu_assign_pointer(dev->br_port, p);
err = netdev_rx_handler_register(dev, br_handle_frame);
err = netdev_rx_handler_register(dev, br_handle_frame, NULL);
if (err)
goto err4;

6
net/core/dev.c
View File

@ -2703,6 +2703,7 @@ void netif_nit_deliver(struct sk_buff *skb)
* netdev_rx_handler_register - register receive handler
* @dev: device to register a handler for
* @rx_handler: receive handler to register
* @rx_handler_data: data pointer that is used by rx handler
*
* Register a receive hander for a device. This handler will then be
* called from __netif_receive_skb. A negative errno code is returned
@ -2711,13 +2712,15 @@ void netif_nit_deliver(struct sk_buff *skb)
* The caller must hold the rtnl_mutex.
*/
int netdev_rx_handler_register(struct net_device *dev,
rx_handler_func_t *rx_handler)
rx_handler_func_t *rx_handler,
void *rx_handler_data)
{
ASSERT_RTNL();
if (dev->rx_handler)
return -EBUSY;
rcu_assign_pointer(dev->rx_handler_data, rx_handler_data);
rcu_assign_pointer(dev->rx_handler, rx_handler);
return 0;
@ -2737,6 +2740,7 @@ void netdev_rx_handler_unregister(struct net_device *dev)
ASSERT_RTNL();
rcu_assign_pointer(dev->rx_handler, NULL);
rcu_assign_pointer(dev->rx_handler_data, NULL);
}
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);