net: ndo_bridge_setlink: Add extack
Drivers may not be able to implement a VLAN addition or reconfiguration. In those cases it's desirable to explain to the user that it was rejected (and why). To that end, add extack argument to ndo_bridge_setlink. Adapt all users to that change. Following patches will use the new argument in the bridge driver. Signed-off-by: Petr Machata <petrm@mellanox.com> Acked-by: Jiri Pirko <jiri@mellanox.com> Reviewed-by: Ido Schimmel <idosch@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
351cbde969
commit
2fd527b72b
|
@ -9618,7 +9618,7 @@ static int bnxt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
|
||||||
}
|
}
|
||||||
|
|
||||||
static int bnxt_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,
|
static int bnxt_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,
|
||||||
u16 flags)
|
u16 flags, struct netlink_ext_ack *extack)
|
||||||
{
|
{
|
||||||
struct bnxt *bp = netdev_priv(dev);
|
struct bnxt *bp = netdev_priv(dev);
|
||||||
struct nlattr *attr, *br_spec;
|
struct nlattr *attr, *br_spec;
|
||||||
|
|
|
@ -4955,7 +4955,7 @@ fw_exit:
|
||||||
}
|
}
|
||||||
|
|
||||||
static int be_ndo_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,
|
static int be_ndo_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,
|
||||||
u16 flags)
|
u16 flags, struct netlink_ext_ack *extack)
|
||||||
{
|
{
|
||||||
struct be_adapter *adapter = netdev_priv(dev);
|
struct be_adapter *adapter = netdev_priv(dev);
|
||||||
struct nlattr *attr, *br_spec;
|
struct nlattr *attr, *br_spec;
|
||||||
|
|
|
@ -11685,6 +11685,7 @@ static int i40e_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
|
||||||
* @dev: the netdev being configured
|
* @dev: the netdev being configured
|
||||||
* @nlh: RTNL message
|
* @nlh: RTNL message
|
||||||
* @flags: bridge flags
|
* @flags: bridge flags
|
||||||
|
* @extack: netlink extended ack
|
||||||
*
|
*
|
||||||
* Inserts a new hardware bridge if not already created and
|
* Inserts a new hardware bridge if not already created and
|
||||||
* enables the bridging mode requested (VEB or VEPA). If the
|
* enables the bridging mode requested (VEB or VEPA). If the
|
||||||
|
@ -11697,7 +11698,8 @@ static int i40e_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
|
||||||
**/
|
**/
|
||||||
static int i40e_ndo_bridge_setlink(struct net_device *dev,
|
static int i40e_ndo_bridge_setlink(struct net_device *dev,
|
||||||
struct nlmsghdr *nlh,
|
struct nlmsghdr *nlh,
|
||||||
u16 flags)
|
u16 flags,
|
||||||
|
struct netlink_ext_ack *extack)
|
||||||
{
|
{
|
||||||
struct i40e_netdev_priv *np = netdev_priv(dev);
|
struct i40e_netdev_priv *np = netdev_priv(dev);
|
||||||
struct i40e_vsi *vsi = np->vsi;
|
struct i40e_vsi *vsi = np->vsi;
|
||||||
|
|
|
@ -3624,6 +3624,7 @@ static int ice_vsi_update_bridge_mode(struct ice_vsi *vsi, u16 bmode)
|
||||||
* @dev: the netdev being configured
|
* @dev: the netdev being configured
|
||||||
* @nlh: RTNL message
|
* @nlh: RTNL message
|
||||||
* @flags: bridge setlink flags
|
* @flags: bridge setlink flags
|
||||||
|
* @extack: netlink extended ack
|
||||||
*
|
*
|
||||||
* Sets the bridge mode (VEB/VEPA) of the switch to which the netdev (VSI) is
|
* Sets the bridge mode (VEB/VEPA) of the switch to which the netdev (VSI) is
|
||||||
* hooked up to. Iterates through the PF VSI list and sets the loopback mode (if
|
* hooked up to. Iterates through the PF VSI list and sets the loopback mode (if
|
||||||
|
@ -3632,7 +3633,7 @@ static int ice_vsi_update_bridge_mode(struct ice_vsi *vsi, u16 bmode)
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
ice_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,
|
ice_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,
|
||||||
u16 __always_unused flags)
|
u16 __always_unused flags, struct netlink_ext_ack *extack)
|
||||||
{
|
{
|
||||||
struct ice_netdev_priv *np = netdev_priv(dev);
|
struct ice_netdev_priv *np = netdev_priv(dev);
|
||||||
struct ice_pf *pf = np->vsi->back;
|
struct ice_pf *pf = np->vsi->back;
|
||||||
|
|
|
@ -9979,7 +9979,8 @@ static int ixgbe_configure_bridge_mode(struct ixgbe_adapter *adapter,
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ixgbe_ndo_bridge_setlink(struct net_device *dev,
|
static int ixgbe_ndo_bridge_setlink(struct net_device *dev,
|
||||||
struct nlmsghdr *nlh, u16 flags)
|
struct nlmsghdr *nlh, u16 flags,
|
||||||
|
struct netlink_ext_ack *extack)
|
||||||
{
|
{
|
||||||
struct ixgbe_adapter *adapter = netdev_priv(dev);
|
struct ixgbe_adapter *adapter = netdev_priv(dev);
|
||||||
struct nlattr *attr, *br_spec;
|
struct nlattr *attr, *br_spec;
|
||||||
|
|
|
@ -1165,7 +1165,7 @@ struct dev_ifalias {
|
||||||
* entries to skb and update idx with the number of entries.
|
* entries to skb and update idx with the number of entries.
|
||||||
*
|
*
|
||||||
* int (*ndo_bridge_setlink)(struct net_device *dev, struct nlmsghdr *nlh,
|
* int (*ndo_bridge_setlink)(struct net_device *dev, struct nlmsghdr *nlh,
|
||||||
* u16 flags)
|
* u16 flags, struct netlink_ext_ack *extack)
|
||||||
* int (*ndo_bridge_getlink)(struct sk_buff *skb, u32 pid, u32 seq,
|
* int (*ndo_bridge_getlink)(struct sk_buff *skb, u32 pid, u32 seq,
|
||||||
* struct net_device *dev, u32 filter_mask,
|
* struct net_device *dev, u32 filter_mask,
|
||||||
* int nlflags)
|
* int nlflags)
|
||||||
|
@ -1390,7 +1390,8 @@ struct net_device_ops {
|
||||||
|
|
||||||
int (*ndo_bridge_setlink)(struct net_device *dev,
|
int (*ndo_bridge_setlink)(struct net_device *dev,
|
||||||
struct nlmsghdr *nlh,
|
struct nlmsghdr *nlh,
|
||||||
u16 flags);
|
u16 flags,
|
||||||
|
struct netlink_ext_ack *extack);
|
||||||
int (*ndo_bridge_getlink)(struct sk_buff *skb,
|
int (*ndo_bridge_getlink)(struct sk_buff *skb,
|
||||||
u32 pid, u32 seq,
|
u32 pid, u32 seq,
|
||||||
struct net_device *dev,
|
struct net_device *dev,
|
||||||
|
|
|
@ -850,7 +850,8 @@ static int br_setport(struct net_bridge_port *p, struct nlattr *tb[])
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Change state and parameters on port. */
|
/* Change state and parameters on port. */
|
||||||
int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
|
int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags,
|
||||||
|
struct netlink_ext_ack *extack)
|
||||||
{
|
{
|
||||||
struct net_bridge *br = (struct net_bridge *)netdev_priv(dev);
|
struct net_bridge *br = (struct net_bridge *)netdev_priv(dev);
|
||||||
struct nlattr *tb[IFLA_BRPORT_MAX + 1];
|
struct nlattr *tb[IFLA_BRPORT_MAX + 1];
|
||||||
|
|
|
@ -1138,7 +1138,8 @@ int br_netlink_init(void);
|
||||||
void br_netlink_fini(void);
|
void br_netlink_fini(void);
|
||||||
void br_ifinfo_notify(int event, const struct net_bridge *br,
|
void br_ifinfo_notify(int event, const struct net_bridge *br,
|
||||||
const struct net_bridge_port *port);
|
const struct net_bridge_port *port);
|
||||||
int br_setlink(struct net_device *dev, struct nlmsghdr *nlmsg, u16 flags);
|
int br_setlink(struct net_device *dev, struct nlmsghdr *nlmsg, u16 flags,
|
||||||
|
struct netlink_ext_ack *extack);
|
||||||
int br_dellink(struct net_device *dev, struct nlmsghdr *nlmsg, u16 flags);
|
int br_dellink(struct net_device *dev, struct nlmsghdr *nlmsg, u16 flags);
|
||||||
int br_getlink(struct sk_buff *skb, u32 pid, u32 seq, struct net_device *dev,
|
int br_getlink(struct sk_buff *skb, u32 pid, u32 seq, struct net_device *dev,
|
||||||
u32 filter_mask, int nlflags);
|
u32 filter_mask, int nlflags);
|
||||||
|
|
|
@ -4332,7 +4332,8 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh,
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
err = br_dev->netdev_ops->ndo_bridge_setlink(dev, nlh, flags);
|
err = br_dev->netdev_ops->ndo_bridge_setlink(dev, nlh, flags,
|
||||||
|
extack);
|
||||||
if (err)
|
if (err)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
@ -4344,7 +4345,8 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh,
|
||||||
err = -EOPNOTSUPP;
|
err = -EOPNOTSUPP;
|
||||||
else
|
else
|
||||||
err = dev->netdev_ops->ndo_bridge_setlink(dev, nlh,
|
err = dev->netdev_ops->ndo_bridge_setlink(dev, nlh,
|
||||||
flags);
|
flags,
|
||||||
|
extack);
|
||||||
if (!err) {
|
if (!err) {
|
||||||
flags &= ~BRIDGE_FLAGS_SELF;
|
flags &= ~BRIDGE_FLAGS_SELF;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue