From: sfeldma@gmail.com
To: netdev@vger.kernel.org
Cc: jiri@resnulli.us, roopa@cumulusnetworks.com, linux@roeck-us.net,
f.fainelli@gmail.com, sridhar.samudrala@intel.com,
ronen.arad@intel.com
Subject: [PATCH net-next v3 23/26] switchdev: rename netdev_switch_fib_* to swdev_fib_*
Date: Thu, 2 Apr 2015 01:10:09 -0700 [thread overview]
Message-ID: <1427962212-18411-24-git-send-email-sfeldma@gmail.com> (raw)
In-Reply-To: <1427962212-18411-1-git-send-email-sfeldma@gmail.com>
From: Scott Feldman <sfeldma@gmail.com>
To be consistent with other swdev code, rename the L3 FIB ops with swdev_
prefix.
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
---
include/net/switchdev.h | 23 ++++++++++-------------
net/ipv4/fib_trie.c | 38 ++++++++++++++++----------------------
net/switchdev/switchdev.c | 34 +++++++++++++++++-----------------
3 files changed, 43 insertions(+), 52 deletions(-)
diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index efd7753..ac93a08 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -125,11 +125,11 @@ int register_netdev_switch_notifier(struct notifier_block *nb);
int unregister_netdev_switch_notifier(struct notifier_block *nb);
int call_netdev_switch_notifiers(unsigned long val, struct net_device *dev,
struct netdev_switch_notifier_info *info);
-int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
- u8 tos, u8 type, u32 nlflags, u32 tb_id);
-int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
- u8 tos, u8 type, u32 tb_id);
-void netdev_switch_fib_ipv4_abort(struct fib_info *fi);
+int swdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
+ u8 tos, u8 type, u32 nlflags, u32 tb_id);
+int swdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
+ u8 tos, u8 type, u32 tb_id);
+void swdev_fib_ipv4_abort(struct fib_info *fi);
#else
@@ -192,22 +192,19 @@ static inline int call_netdev_switch_notifiers(unsigned long val, struct net_dev
return NOTIFY_DONE;
}
-static inline int netdev_switch_fib_ipv4_add(u32 dst, int dst_len,
- struct fib_info *fi,
- u8 tos, u8 type,
- u32 nlflags, u32 tb_id)
+static inline int swdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
+ u8 tos, u8 type, u32 nlflags, u32 tb_id)
{
return 0;
}
-static inline int netdev_switch_fib_ipv4_del(u32 dst, int dst_len,
- struct fib_info *fi,
- u8 tos, u8 type, u32 tb_id)
+static inline int swdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
+ u8 tos, u8 type, u32 tb_id)
{
return 0;
}
-static inline void netdev_switch_fib_ipv4_abort(struct fib_info *fi)
+static inline void swdev_fib_ipv4_abort(struct fib_info *fi)
{
}
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 2c7c299..a452f38 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1165,13 +1165,11 @@ int fib_table_insert(struct fib_table *tb, struct fib_config *cfg)
new_fa->fa_state = state & ~FA_S_ACCESSED;
new_fa->fa_slen = fa->fa_slen;
- err = netdev_switch_fib_ipv4_add(key, plen, fi,
- new_fa->fa_tos,
- cfg->fc_type,
- cfg->fc_nlflags,
- tb->tb_id);
+ err = swdev_fib_ipv4_add(key, plen, fi, new_fa->fa_tos,
+ cfg->fc_type, cfg->fc_nlflags,
+ tb->tb_id);
if (err) {
- netdev_switch_fib_ipv4_abort(fi);
+ swdev_fib_ipv4_abort(fi);
kmem_cache_free(fn_alias_kmem, new_fa);
goto out;
}
@@ -1215,12 +1213,10 @@ int fib_table_insert(struct fib_table *tb, struct fib_config *cfg)
new_fa->tb_id = tb->tb_id;
/* (Optionally) offload fib entry to switch hardware. */
- err = netdev_switch_fib_ipv4_add(key, plen, fi, tos,
- cfg->fc_type,
- cfg->fc_nlflags,
- tb->tb_id);
+ err = swdev_fib_ipv4_add(key, plen, fi, tos, cfg->fc_type,
+ cfg->fc_nlflags, tb->tb_id);
if (err) {
- netdev_switch_fib_ipv4_abort(fi);
+ swdev_fib_ipv4_abort(fi);
goto out_free_new_fa;
}
@@ -1239,7 +1235,7 @@ succeeded:
return 0;
out_sw_fib_del:
- netdev_switch_fib_ipv4_del(key, plen, fi, tos, cfg->fc_type, tb->tb_id);
+ swdev_fib_ipv4_del(key, plen, fi, tos, cfg->fc_type, tb->tb_id);
out_free_new_fa:
kmem_cache_free(fn_alias_kmem, new_fa);
out:
@@ -1517,8 +1513,8 @@ int fib_table_delete(struct fib_table *tb, struct fib_config *cfg)
if (!fa_to_delete)
return -ESRCH;
- netdev_switch_fib_ipv4_del(key, plen, fa_to_delete->fa_info, tos,
- cfg->fc_type, tb->tb_id);
+ swdev_fib_ipv4_del(key, plen, fa_to_delete->fa_info, tos,
+ cfg->fc_type, tb->tb_id);
rtmsg_fib(RTM_DELROUTE, htonl(key), fa_to_delete, plen, tb->tb_id,
&cfg->fc_nlinfo, 0);
@@ -1767,10 +1763,9 @@ void fib_table_flush_external(struct fib_table *tb)
if (!fi || !(fi->fib_flags & RTNH_F_EXTERNAL))
continue;
- netdev_switch_fib_ipv4_del(n->key,
- KEYLENGTH - fa->fa_slen,
- fi, fa->fa_tos,
- fa->fa_type, tb->tb_id);
+ swdev_fib_ipv4_del(n->key, KEYLENGTH - fa->fa_slen,
+ fi, fa->fa_tos, fa->fa_type,
+ tb->tb_id);
}
/* update leaf slen */
@@ -1835,10 +1830,9 @@ int fib_table_flush(struct fib_table *tb)
continue;
}
- netdev_switch_fib_ipv4_del(n->key,
- KEYLENGTH - fa->fa_slen,
- fi, fa->fa_tos,
- fa->fa_type, tb->tb_id);
+ swdev_fib_ipv4_del(n->key, KEYLENGTH - fa->fa_slen,
+ fi, fa->fa_tos, fa->fa_type,
+ tb->tb_id);
hlist_del_rcu(&fa->fa_list);
fib_release_info(fa->fa_info);
alias_free_mem_rcu(fa);
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 5324248..35d203c 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -517,7 +517,7 @@ int swdev_port_bridge_dellink(struct net_device *dev,
}
EXPORT_SYMBOL_GPL(swdev_port_bridge_dellink);
-static struct net_device *netdev_switch_get_lowest_dev(struct net_device *dev)
+static struct net_device *swdev_get_lowest_dev(struct net_device *dev)
{
const struct swdev_ops *ops = dev->swdev_ops;
struct net_device *lower_dev;
@@ -532,7 +532,7 @@ static struct net_device *netdev_switch_get_lowest_dev(struct net_device *dev)
return dev;
netdev_for_each_lower_dev(dev, lower_dev, iter) {
- port_dev = netdev_switch_get_lowest_dev(lower_dev);
+ port_dev = swdev_get_lowest_dev(lower_dev);
if (port_dev)
return port_dev;
}
@@ -540,7 +540,7 @@ static struct net_device *netdev_switch_get_lowest_dev(struct net_device *dev)
return NULL;
}
-static struct net_device *netdev_switch_get_dev_by_nhs(struct fib_info *fi)
+static struct net_device *swdev_get_dev_by_nhs(struct fib_info *fi)
{
struct swdev_attr attr = {
.id = SWDEV_ATTR_PORT_PARENT_ID,
@@ -557,7 +557,7 @@ static struct net_device *netdev_switch_get_dev_by_nhs(struct fib_info *fi)
if (!nh->nh_dev)
return NULL;
- dev = netdev_switch_get_lowest_dev(nh->nh_dev);
+ dev = swdev_get_lowest_dev(nh->nh_dev);
if (!dev)
return NULL;
@@ -579,7 +579,7 @@ static struct net_device *netdev_switch_get_dev_by_nhs(struct fib_info *fi)
}
/**
- * netdev_switch_fib_ipv4_add - Add IPv4 route entry to switch
+ * swdev_fib_ipv4_add - Add IPv4 route entry to switch
*
* @dst: route's IPv4 destination address
* @dst_len: destination address length (prefix length)
@@ -591,8 +591,8 @@ static struct net_device *netdev_switch_get_dev_by_nhs(struct fib_info *fi)
*
* Add IPv4 route entry to switch device.
*/
-int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
- u8 tos, u8 type, u32 nlflags, u32 tb_id)
+int swdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
+ u8 tos, u8 type, u32 nlflags, u32 tb_id)
{
struct net_device *dev;
const struct swdev_ops *ops;
@@ -610,7 +610,7 @@ int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
if (fi->fib_net->ipv4.fib_offload_disabled)
return 0;
- dev = netdev_switch_get_dev_by_nhs(fi);
+ dev = swdev_get_dev_by_nhs(fi);
if (!dev)
return 0;
ops = dev->swdev_ops;
@@ -625,10 +625,10 @@ int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
return err;
}
-EXPORT_SYMBOL_GPL(netdev_switch_fib_ipv4_add);
+EXPORT_SYMBOL_GPL(swdev_fib_ipv4_add);
/**
- * netdev_switch_fib_ipv4_del - Delete IPv4 route entry from switch
+ * swdev_fib_ipv4_del - Delete IPv4 route entry from switch
*
* @dst: route's IPv4 destination address
* @dst_len: destination address length (prefix length)
@@ -639,8 +639,8 @@ EXPORT_SYMBOL_GPL(netdev_switch_fib_ipv4_add);
*
* Delete IPv4 route entry from switch device.
*/
-int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
- u8 tos, u8 type, u32 tb_id)
+int swdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
+ u8 tos, u8 type, u32 tb_id)
{
struct net_device *dev;
const struct swdev_ops *ops;
@@ -649,7 +649,7 @@ int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
if (!(fi->fib_flags & RTNH_F_EXTERNAL))
return 0;
- dev = netdev_switch_get_dev_by_nhs(fi);
+ dev = swdev_get_dev_by_nhs(fi);
if (!dev)
return 0;
ops = dev->swdev_ops;
@@ -663,14 +663,14 @@ int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
return err;
}
-EXPORT_SYMBOL_GPL(netdev_switch_fib_ipv4_del);
+EXPORT_SYMBOL_GPL(swdev_fib_ipv4_del);
/**
- * netdev_switch_fib_ipv4_abort - Abort an IPv4 FIB operation
+ * swdev_fib_ipv4_abort - Abort an IPv4 FIB operation
*
* @fi: route FIB info structure
*/
-void netdev_switch_fib_ipv4_abort(struct fib_info *fi)
+void swdev_fib_ipv4_abort(struct fib_info *fi)
{
/* There was a problem installing this route to the offload
* device. For now, until we come up with more refined
@@ -683,4 +683,4 @@ void netdev_switch_fib_ipv4_abort(struct fib_info *fi)
fib_flush_external(fi->fib_net);
fi->fib_net->ipv4.fib_offload_disabled = true;
}
-EXPORT_SYMBOL_GPL(netdev_switch_fib_ipv4_abort);
+EXPORT_SYMBOL_GPL(swdev_fib_ipv4_abort);
--
1.7.10.4
next prev parent reply other threads:[~2015-04-02 8:09 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-02 8:09 [PATCH net-next v3 00/26] switchdev: spring cleanup sfeldma
2015-04-02 8:09 ` [PATCH net-next v3 01/26] switchdev: introduce get/set attrs ops sfeldma
2015-04-02 9:09 ` Florian Fainelli
2015-04-02 17:52 ` Scott Feldman
2015-04-02 18:16 ` Jiri Pirko
2015-04-04 1:44 ` roopa
2015-04-02 8:09 ` [PATCH net-next v3 02/26] switchdev: convert parent_id_get to swdev attr get sfeldma
2015-04-02 8:09 ` [PATCH net-next v3 03/26] switchdev: convert STP update to swdev attr set sfeldma
2015-04-02 8:09 ` [PATCH net-next v3 04/26] switchdev: add bridge port flags attr sfeldma
2015-04-02 8:09 ` [PATCH net-next v3 05/26] rocker: use swdev get/set attr for bridge port flags sfeldma
2015-04-02 8:09 ` [PATCH net-next v3 06/26] switchdev: introduce swdev add/del obj ops sfeldma
2015-04-02 8:09 ` [PATCH net-next v3 07/26] switchdev: add port vlan obj sfeldma
2015-04-02 8:09 ` [PATCH net-next v3 08/26] rocker: use swdev add/del obj for bridge port vlans sfeldma
2015-04-02 8:09 ` [PATCH net-next v3 09/26] switchdev: add new swdev bridge setlink sfeldma
2015-04-02 8:09 ` [PATCH net-next v3 10/26] rocker: cut over to new swdev_port_bridge_setlink sfeldma
2015-04-02 8:09 ` [PATCH net-next v3 11/26] bonding: " sfeldma
2015-04-02 8:09 ` [PATCH net-next v3 12/26] team: " sfeldma
2015-04-02 8:09 ` [PATCH net-next v3 13/26] switchdev: remove old netdev_switch_port_bridge_setlink sfeldma
2015-04-02 8:10 ` [PATCH net-next v3 14/26] switchdev: add new swdev_port_bridge_dellink sfeldma
2015-04-02 8:10 ` [PATCH net-next v3 15/26] rocker: cut over to " sfeldma
2015-04-02 8:10 ` [PATCH net-next v3 16/26] bonding: " sfeldma
2015-04-02 8:10 ` [PATCH net-next v3 17/26] team: " sfeldma
2015-04-02 8:10 ` [PATCH net-next v3 18/26] switchdev: remove unused netdev_switch_port_bridge_dellink sfeldma
2015-04-02 8:10 ` [PATCH net-next v3 19/26] switchdev: add new swdev_port_bridge_getlink sfeldma
2015-04-04 16:56 ` Arad, Ronen
2015-04-06 21:13 ` Scott Feldman
2015-04-06 21:58 ` Arad, Ronen
2015-04-02 8:10 ` [PATCH net-next v3 20/26] rocker: cut over to " sfeldma
2015-04-02 8:10 ` [PATCH net-next v3 21/26] bonding: " sfeldma
2015-04-02 8:10 ` [PATCH net-next v3 22/26] team: " sfeldma
2015-04-02 8:10 ` sfeldma [this message]
2015-04-02 8:10 ` [PATCH net-next v3 24/26] switchdev: rename netdev_switch_notifier_* to swdev_notifier_* sfeldma
2015-04-02 8:10 ` [PATCH net-next v3 25/26] switchdev: convert swdev_fib_ipv4_add/del over to swdev_port_obj_add/del sfeldma
2015-04-02 8:10 ` [PATCH net-next v3 26/26] switchdev: bring documentation up-to-date sfeldma
2015-04-02 8:15 ` [PATCH net-next v3 00/26] switchdev: spring cleanup Jiri Pirko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427962212-18411-24-git-send-email-sfeldma@gmail.com \
--to=sfeldma@gmail.com \
--cc=f.fainelli@gmail.com \
--cc=jiri@resnulli.us \
--cc=linux@roeck-us.net \
--cc=netdev@vger.kernel.org \
--cc=ronen.arad@intel.com \
--cc=roopa@cumulusnetworks.com \
--cc=sridhar.samudrala@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).