net: remove indirect block netdev event registration
[linux-2.6-microblaze.git] / net / core / flow_offload.c
index 8cd7da2..0cfc35e 100644 (file)
@@ -473,241 +473,3 @@ int flow_indr_dev_setup_offload(struct net_device *dev,
        return list_empty(&bo->cb_list) ? -EOPNOTSUPP : 0;
 }
 EXPORT_SYMBOL(flow_indr_dev_setup_offload);
-
-static LIST_HEAD(block_cb_list);
-
-static struct rhashtable indr_setup_block_ht;
-
-struct flow_indr_block_cb {
-       struct list_head list;
-       void *cb_priv;
-       flow_indr_block_bind_cb_t *cb;
-       void *cb_ident;
-};
-
-struct flow_indr_block_dev {
-       struct rhash_head ht_node;
-       struct net_device *dev;
-       unsigned int refcnt;
-       struct list_head cb_list;
-};
-
-static const struct rhashtable_params flow_indr_setup_block_ht_params = {
-       .key_offset     = offsetof(struct flow_indr_block_dev, dev),
-       .head_offset    = offsetof(struct flow_indr_block_dev, ht_node),
-       .key_len        = sizeof(struct net_device *),
-};
-
-static struct flow_indr_block_dev *
-flow_indr_block_dev_lookup(struct net_device *dev)
-{
-       return rhashtable_lookup_fast(&indr_setup_block_ht, &dev,
-                                     flow_indr_setup_block_ht_params);
-}
-
-static struct flow_indr_block_dev *
-flow_indr_block_dev_get(struct net_device *dev)
-{
-       struct flow_indr_block_dev *indr_dev;
-
-       indr_dev = flow_indr_block_dev_lookup(dev);
-       if (indr_dev)
-               goto inc_ref;
-
-       indr_dev = kzalloc(sizeof(*indr_dev), GFP_KERNEL);
-       if (!indr_dev)
-               return NULL;
-
-       INIT_LIST_HEAD(&indr_dev->cb_list);
-       indr_dev->dev = dev;
-       if (rhashtable_insert_fast(&indr_setup_block_ht, &indr_dev->ht_node,
-                                  flow_indr_setup_block_ht_params)) {
-               kfree(indr_dev);
-               return NULL;
-       }
-
-inc_ref:
-       indr_dev->refcnt++;
-       return indr_dev;
-}
-
-static void flow_indr_block_dev_put(struct flow_indr_block_dev *indr_dev)
-{
-       if (--indr_dev->refcnt)
-               return;
-
-       rhashtable_remove_fast(&indr_setup_block_ht, &indr_dev->ht_node,
-                              flow_indr_setup_block_ht_params);
-       kfree(indr_dev);
-}
-
-static struct flow_indr_block_cb *
-flow_indr_block_cb_lookup(struct flow_indr_block_dev *indr_dev,
-                         flow_indr_block_bind_cb_t *cb, void *cb_ident)
-{
-       struct flow_indr_block_cb *indr_block_cb;
-
-       list_for_each_entry(indr_block_cb, &indr_dev->cb_list, list)
-               if (indr_block_cb->cb == cb &&
-                   indr_block_cb->cb_ident == cb_ident)
-                       return indr_block_cb;
-       return NULL;
-}
-
-static struct flow_indr_block_cb *
-flow_indr_block_cb_add(struct flow_indr_block_dev *indr_dev, void *cb_priv,
-                      flow_indr_block_bind_cb_t *cb, void *cb_ident)
-{
-       struct flow_indr_block_cb *indr_block_cb;
-
-       indr_block_cb = flow_indr_block_cb_lookup(indr_dev, cb, cb_ident);
-       if (indr_block_cb)
-               return ERR_PTR(-EEXIST);
-
-       indr_block_cb = kzalloc(sizeof(*indr_block_cb), GFP_KERNEL);
-       if (!indr_block_cb)
-               return ERR_PTR(-ENOMEM);
-
-       indr_block_cb->cb_priv = cb_priv;
-       indr_block_cb->cb = cb;
-       indr_block_cb->cb_ident = cb_ident;
-       list_add(&indr_block_cb->list, &indr_dev->cb_list);
-
-       return indr_block_cb;
-}
-
-static void flow_indr_block_cb_del(struct flow_indr_block_cb *indr_block_cb)
-{
-       list_del(&indr_block_cb->list);
-       kfree(indr_block_cb);
-}
-
-static DEFINE_MUTEX(flow_indr_block_cb_lock);
-
-static void flow_block_cmd(struct net_device *dev,
-                          flow_indr_block_bind_cb_t *cb, void *cb_priv,
-                          enum flow_block_command command)
-{
-       struct flow_indr_block_entry *entry;
-
-       mutex_lock(&flow_indr_block_cb_lock);
-       list_for_each_entry(entry, &block_cb_list, list) {
-               entry->cb(dev, cb, cb_priv, command);
-       }
-       mutex_unlock(&flow_indr_block_cb_lock);
-}
-
-int __flow_indr_block_cb_register(struct net_device *dev, void *cb_priv,
-                                 flow_indr_block_bind_cb_t *cb,
-                                 void *cb_ident)
-{
-       struct flow_indr_block_cb *indr_block_cb;
-       struct flow_indr_block_dev *indr_dev;
-       int err;
-
-       indr_dev = flow_indr_block_dev_get(dev);
-       if (!indr_dev)
-               return -ENOMEM;
-
-       indr_block_cb = flow_indr_block_cb_add(indr_dev, cb_priv, cb, cb_ident);
-       err = PTR_ERR_OR_ZERO(indr_block_cb);
-       if (err)
-               goto err_dev_put;
-
-       flow_block_cmd(dev, indr_block_cb->cb, indr_block_cb->cb_priv,
-                      FLOW_BLOCK_BIND);
-
-       return 0;
-
-err_dev_put:
-       flow_indr_block_dev_put(indr_dev);
-       return err;
-}
-EXPORT_SYMBOL_GPL(__flow_indr_block_cb_register);
-
-int flow_indr_block_cb_register(struct net_device *dev, void *cb_priv,
-                               flow_indr_block_bind_cb_t *cb,
-                               void *cb_ident)
-{
-       int err;
-
-       rtnl_lock();
-       err = __flow_indr_block_cb_register(dev, cb_priv, cb, cb_ident);
-       rtnl_unlock();
-
-       return err;
-}
-EXPORT_SYMBOL_GPL(flow_indr_block_cb_register);
-
-void __flow_indr_block_cb_unregister(struct net_device *dev,
-                                    flow_indr_block_bind_cb_t *cb,
-                                    void *cb_ident)
-{
-       struct flow_indr_block_cb *indr_block_cb;
-       struct flow_indr_block_dev *indr_dev;
-
-       indr_dev = flow_indr_block_dev_lookup(dev);
-       if (!indr_dev)
-               return;
-
-       indr_block_cb = flow_indr_block_cb_lookup(indr_dev, cb, cb_ident);
-       if (!indr_block_cb)
-               return;
-
-       flow_block_cmd(dev, indr_block_cb->cb, indr_block_cb->cb_priv,
-                      FLOW_BLOCK_UNBIND);
-
-       flow_indr_block_cb_del(indr_block_cb);
-       flow_indr_block_dev_put(indr_dev);
-}
-EXPORT_SYMBOL_GPL(__flow_indr_block_cb_unregister);
-
-void flow_indr_block_cb_unregister(struct net_device *dev,
-                                  flow_indr_block_bind_cb_t *cb,
-                                  void *cb_ident)
-{
-       rtnl_lock();
-       __flow_indr_block_cb_unregister(dev, cb, cb_ident);
-       rtnl_unlock();
-}
-EXPORT_SYMBOL_GPL(flow_indr_block_cb_unregister);
-
-void flow_indr_block_call(struct net_device *dev,
-                         struct flow_block_offload *bo,
-                         enum flow_block_command command,
-                         enum tc_setup_type type)
-{
-       struct flow_indr_block_cb *indr_block_cb;
-       struct flow_indr_block_dev *indr_dev;
-
-       indr_dev = flow_indr_block_dev_lookup(dev);
-       if (!indr_dev)
-               return;
-
-       list_for_each_entry(indr_block_cb, &indr_dev->cb_list, list)
-               indr_block_cb->cb(dev, indr_block_cb->cb_priv, type, bo);
-}
-EXPORT_SYMBOL_GPL(flow_indr_block_call);
-
-void flow_indr_add_block_cb(struct flow_indr_block_entry *entry)
-{
-       mutex_lock(&flow_indr_block_cb_lock);
-       list_add_tail(&entry->list, &block_cb_list);
-       mutex_unlock(&flow_indr_block_cb_lock);
-}
-EXPORT_SYMBOL_GPL(flow_indr_add_block_cb);
-
-void flow_indr_del_block_cb(struct flow_indr_block_entry *entry)
-{
-       mutex_lock(&flow_indr_block_cb_lock);
-       list_del(&entry->list);
-       mutex_unlock(&flow_indr_block_cb_lock);
-}
-EXPORT_SYMBOL_GPL(flow_indr_del_block_cb);
-
-static int __init init_flow_indr_rhashtable(void)
-{
-       return rhashtable_init(&indr_setup_block_ht,
-                              &flow_indr_setup_block_ht_params);
-}
-subsys_initcall(init_flow_indr_rhashtable);