4 files changed, 10 insertions, 4 deletions

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 59c315556a30..87a3bf69c4a3 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -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);
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index fb20cc55ba52..361ff1145cf1 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -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);
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 97ac9da4d76c..0d142ed0bbe3 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -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;
 
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)
  *      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);