openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

switchdev: rename switchdev_obj_vlan to switchdev_obj_port_vlan 

Make the struct name in sync with object id name.

Suggested-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Scott Feldman <sfeldma@gmail.com>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2015-10-01 11:03:43 +02:00 committed by David S. Miller
parent 1f86839874
commit 8f24f3095d
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/rocker/rocker.c
View File

@ -4408,7 +4408,7 @@ static int rocker_port_vlan_add(struct rocker_port *rocker_port,
static int rocker_port_vlans_add(struct rocker_port *rocker_port, static int rocker_port_vlans_add(struct rocker_port *rocker_port,
struct switchdev_trans *trans, struct switchdev_trans *trans,
const struct switchdev_obj_vlan *vlan) const struct switchdev_obj_port_vlan *vlan)
{ {
u16 vid; u16 vid;
int err; int err;
@ -4480,7 +4480,7 @@ static int rocker_port_vlan_del(struct rocker_port *rocker_port,
} }
static int rocker_port_vlans_del(struct rocker_port *rocker_port, static int rocker_port_vlans_del(struct rocker_port *rocker_port,
const struct switchdev_obj_vlan *vlan) const struct switchdev_obj_port_vlan *vlan)
{ {
u16 vid; u16 vid;
int err; int err;
@ -4565,7 +4565,7 @@ static int rocker_port_fdb_dump(const struct rocker_port *rocker_port,
} }
static int rocker_port_vlan_dump(const struct rocker_port *rocker_port, static int rocker_port_vlan_dump(const struct rocker_port *rocker_port,
struct switchdev_obj_vlan *vlan, struct switchdev_obj_port_vlan *vlan,
int (*cb)(void *obj)) int (*cb)(void *obj))
{ {
u16 vid; u16 vid;

2
include/net/switchdev.h
View File

@ -65,7 +65,7 @@ enum switchdev_obj_id {
}; };
/* SWITCHDEV_OBJ_ID_PORT_VLAN */ /* SWITCHDEV_OBJ_ID_PORT_VLAN */
struct switchdev_obj_vlan { struct switchdev_obj_port_vlan {
u16 flags; u16 flags;
u16 vid_begin; u16 vid_begin;
u16 vid_end; u16 vid_end;

4
net/bridge/br_vlan.c
View File

@ -82,7 +82,7 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br,
if (ops->ndo_vlan_rx_add_vid) { if (ops->ndo_vlan_rx_add_vid) {
err = vlan_vid_add(dev, br->vlan_proto, vid); err = vlan_vid_add(dev, br->vlan_proto, vid);
} else { } else {
struct switchdev_obj_vlan v = { struct switchdev_obj_port_vlan v = {
.flags = flags, .flags = flags,
.vid_begin = vid, .vid_begin = vid,
.vid_end = vid, .vid_end = vid,
@ -132,7 +132,7 @@ static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br,
if (ops->ndo_vlan_rx_kill_vid) { if (ops->ndo_vlan_rx_kill_vid) {
vlan_vid_del(dev, br->vlan_proto, vid); vlan_vid_del(dev, br->vlan_proto, vid);
} else { } else {
struct switchdev_obj_vlan v = { struct switchdev_obj_port_vlan v = {
.vid_begin = vid, .vid_begin = vid,
.vid_end = vid, .vid_end = vid,
}; };

6
net/dsa/slave.c
View File

@ -242,7 +242,7 @@ static int dsa_bridge_check_vlan_range(struct dsa_switch *ds,
} }
static int dsa_slave_port_vlan_add(struct net_device *dev, static int dsa_slave_port_vlan_add(struct net_device *dev,
const struct switchdev_obj_vlan *vlan, const struct switchdev_obj_port_vlan *vlan,
struct switchdev_trans *trans) struct switchdev_trans *trans)
{ {
struct dsa_slave_priv *p = netdev_priv(dev); struct dsa_slave_priv *p = netdev_priv(dev);
@ -278,7 +278,7 @@ static int dsa_slave_port_vlan_add(struct net_device *dev,
} }
static int dsa_slave_port_vlan_del(struct net_device *dev, static int dsa_slave_port_vlan_del(struct net_device *dev,
const struct switchdev_obj_vlan *vlan) const struct switchdev_obj_port_vlan *vlan)
{ {
struct dsa_slave_priv *p = netdev_priv(dev); struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent; struct dsa_switch *ds = p->parent;
@ -298,7 +298,7 @@ static int dsa_slave_port_vlan_del(struct net_device *dev,
} }
static int dsa_slave_port_vlan_dump(struct net_device *dev, static int dsa_slave_port_vlan_dump(struct net_device *dev,
struct switchdev_obj_vlan *vlan, struct switchdev_obj_port_vlan *vlan,
int (*cb)(void *obj)) int (*cb)(void *obj))
{ {
struct dsa_slave_priv *p = netdev_priv(dev); struct dsa_slave_priv *p = netdev_priv(dev);

6
net/switchdev/switchdev.c
View File

@ -483,7 +483,7 @@ int call_switchdev_notifiers(unsigned long val, struct net_device *dev,
EXPORT_SYMBOL_GPL(call_switchdev_notifiers); EXPORT_SYMBOL_GPL(call_switchdev_notifiers);
struct switchdev_vlan_dump { struct switchdev_vlan_dump {
struct switchdev_obj_vlan vlan; struct switchdev_obj_port_vlan vlan;
struct sk_buff *skb; struct sk_buff *skb;
u32 filter_mask; u32 filter_mask;
u16 flags; u16 flags;
@ -523,7 +523,7 @@ static int switchdev_port_vlan_dump_put(struct switchdev_vlan_dump *dump)
static int switchdev_port_vlan_dump_cb(void *obj) static int switchdev_port_vlan_dump_cb(void *obj)
{ {
struct switchdev_obj_vlan *vlan = obj; struct switchdev_obj_port_vlan *vlan = obj;
struct switchdev_vlan_dump *dump = struct switchdev_vlan_dump *dump =
container_of(vlan, struct switchdev_vlan_dump, vlan); container_of(vlan, struct switchdev_vlan_dump, vlan);
int err = 0; int err = 0;
@ -704,7 +704,7 @@ static int switchdev_port_br_afspec(struct net_device *dev,
{ {
struct nlattr *attr; struct nlattr *attr;
struct bridge_vlan_info *vinfo; struct bridge_vlan_info *vinfo;
struct switchdev_obj_vlan vlan = { 0 }; struct switchdev_obj_port_vlan vlan = { 0 };
int rem; int rem;
int err; int err;