Skip to content

Commit

Permalink
switchdev: rename switchdev_obj_vlan to switchdev_obj_port_vlan
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Jiri Pirko authored and David S. Miller committed Oct 3, 2015
1 parent 1f86839 commit 8f24f30
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions drivers/net/ethernet/rocker/rocker.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
struct switchdev_trans *trans,
const struct switchdev_obj_vlan *vlan)
const struct switchdev_obj_port_vlan *vlan)
{
u16 vid;
int err;
Expand Down Expand Up @@ -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,
const struct switchdev_obj_vlan *vlan)
const struct switchdev_obj_port_vlan *vlan)
{
u16 vid;
int err;
Expand Down Expand Up @@ -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,
struct switchdev_obj_vlan *vlan,
struct switchdev_obj_port_vlan *vlan,
int (*cb)(void *obj))
{
u16 vid;
Expand Down
2 changes: 1 addition & 1 deletion include/net/switchdev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ enum switchdev_obj_id {
};

/* SWITCHDEV_OBJ_ID_PORT_VLAN */
struct switchdev_obj_vlan {
struct switchdev_obj_port_vlan {
u16 flags;
u16 vid_begin;
u16 vid_end;
Expand Down
4 changes: 2 additions & 2 deletions net/bridge/br_vlan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br,
if (ops->ndo_vlan_rx_add_vid) {
err = vlan_vid_add(dev, br->vlan_proto, vid);
} else {
struct switchdev_obj_vlan v = {
struct switchdev_obj_port_vlan v = {
.flags = flags,
.vid_begin = vid,
.vid_end = vid,
Expand Down Expand Up @@ -132,7 +132,7 @@ static int __vlan_vid_del(struct net_device *dev, struct net_bridge *br,
if (ops->ndo_vlan_rx_kill_vid) {
vlan_vid_del(dev, br->vlan_proto, vid);
} else {
struct switchdev_obj_vlan v = {
struct switchdev_obj_port_vlan v = {
.vid_begin = vid,
.vid_end = vid,
};
Expand Down
6 changes: 3 additions & 3 deletions net/dsa/slave.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
const struct switchdev_obj_vlan *vlan,
const struct switchdev_obj_port_vlan *vlan,
struct switchdev_trans *trans)
{
struct dsa_slave_priv *p = netdev_priv(dev);
Expand Down Expand Up @@ -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,
const struct switchdev_obj_vlan *vlan)
const struct switchdev_obj_port_vlan *vlan)
{
struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent;
Expand All @@ -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,
struct switchdev_obj_vlan *vlan,
struct switchdev_obj_port_vlan *vlan,
int (*cb)(void *obj))
{
struct dsa_slave_priv *p = netdev_priv(dev);
Expand Down
6 changes: 3 additions & 3 deletions net/switchdev/switchdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ int call_switchdev_notifiers(unsigned long val, struct net_device *dev,
EXPORT_SYMBOL_GPL(call_switchdev_notifiers);

struct switchdev_vlan_dump {
struct switchdev_obj_vlan vlan;
struct switchdev_obj_port_vlan vlan;
struct sk_buff *skb;
u32 filter_mask;
u16 flags;
Expand Down Expand Up @@ -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)
{
struct switchdev_obj_vlan *vlan = obj;
struct switchdev_obj_port_vlan *vlan = obj;
struct switchdev_vlan_dump *dump =
container_of(vlan, struct switchdev_vlan_dump, vlan);
int err = 0;
Expand Down Expand Up @@ -704,7 +704,7 @@ static int switchdev_port_br_afspec(struct net_device *dev,
{
struct nlattr *attr;
struct bridge_vlan_info *vinfo;
struct switchdev_obj_vlan vlan = { 0 };
struct switchdev_obj_port_vlan vlan = { 0 };
int rem;
int err;

Expand Down

0 comments on commit 8f24f30

Please sign in to comment.