mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
rtnetlink: add extack support in fdb del handlers
Add extack support to .ndo_fdb_del in netdevice.h and all related methods. Signed-off-by: Alaa Mohamed <eng.alaamohamedsoliman.am@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
6da3c47264
commit
ca4567f1e6
9 changed files with 17 additions and 10 deletions
|
@ -5688,11 +5688,12 @@ ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[],
|
||||||
* @dev: the net device pointer
|
* @dev: the net device pointer
|
||||||
* @addr: the MAC address entry being added
|
* @addr: the MAC address entry being added
|
||||||
* @vid: VLAN ID
|
* @vid: VLAN ID
|
||||||
|
* @extack: netlink extended ack
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],
|
ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],
|
||||||
struct net_device *dev, const unsigned char *addr,
|
struct net_device *dev, const unsigned char *addr,
|
||||||
__always_unused u16 vid)
|
__always_unused u16 vid, struct netlink_ext_ack *extack)
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
|
|
|
@ -774,7 +774,8 @@ static int ocelot_port_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
|
||||||
|
|
||||||
static int ocelot_port_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
|
static int ocelot_port_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
|
||||||
struct net_device *dev,
|
struct net_device *dev,
|
||||||
const unsigned char *addr, u16 vid)
|
const unsigned char *addr, u16 vid,
|
||||||
|
struct netlink_ext_ack *extack)
|
||||||
{
|
{
|
||||||
struct ocelot_port_private *priv = netdev_priv(dev);
|
struct ocelot_port_private *priv = netdev_priv(dev);
|
||||||
struct ocelot_port *ocelot_port = &priv->port;
|
struct ocelot_port *ocelot_port = &priv->port;
|
||||||
|
|
|
@ -368,7 +368,8 @@ static int qlcnic_set_mac(struct net_device *netdev, void *p)
|
||||||
|
|
||||||
static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
|
static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
|
||||||
struct net_device *netdev,
|
struct net_device *netdev,
|
||||||
const unsigned char *addr, u16 vid)
|
const unsigned char *addr, u16 vid,
|
||||||
|
struct netlink_ext_ack *extack)
|
||||||
{
|
{
|
||||||
struct qlcnic_adapter *adapter = netdev_priv(netdev);
|
struct qlcnic_adapter *adapter = netdev_priv(netdev);
|
||||||
int err = -EOPNOTSUPP;
|
int err = -EOPNOTSUPP;
|
||||||
|
|
|
@ -1020,7 +1020,8 @@ static int macvlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
|
||||||
|
|
||||||
static int macvlan_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
|
static int macvlan_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
|
||||||
struct net_device *dev,
|
struct net_device *dev,
|
||||||
const unsigned char *addr, u16 vid)
|
const unsigned char *addr, u16 vid,
|
||||||
|
struct netlink_ext_ack *extack)
|
||||||
{
|
{
|
||||||
struct macvlan_dev *vlan = netdev_priv(dev);
|
struct macvlan_dev *vlan = netdev_priv(dev);
|
||||||
int err = -EINVAL;
|
int err = -EINVAL;
|
||||||
|
|
|
@ -1280,7 +1280,8 @@ int __vxlan_fdb_delete(struct vxlan_dev *vxlan,
|
||||||
/* Delete entry (via netlink) */
|
/* Delete entry (via netlink) */
|
||||||
static int vxlan_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
|
static int vxlan_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
|
||||||
struct net_device *dev,
|
struct net_device *dev,
|
||||||
const unsigned char *addr, u16 vid)
|
const unsigned char *addr, u16 vid,
|
||||||
|
struct netlink_ext_ack *extack)
|
||||||
{
|
{
|
||||||
struct vxlan_dev *vxlan = netdev_priv(dev);
|
struct vxlan_dev *vxlan = netdev_priv(dev);
|
||||||
union vxlan_addr ip;
|
union vxlan_addr ip;
|
||||||
|
|
|
@ -1513,7 +1513,7 @@ struct net_device_ops {
|
||||||
struct nlattr *tb[],
|
struct nlattr *tb[],
|
||||||
struct net_device *dev,
|
struct net_device *dev,
|
||||||
const unsigned char *addr,
|
const unsigned char *addr,
|
||||||
u16 vid);
|
u16 vid, struct netlink_ext_ack *extack);
|
||||||
int (*ndo_fdb_del_bulk)(struct ndmsg *ndm,
|
int (*ndo_fdb_del_bulk)(struct ndmsg *ndm,
|
||||||
struct nlattr *tb[],
|
struct nlattr *tb[],
|
||||||
struct net_device *dev,
|
struct net_device *dev,
|
||||||
|
|
|
@ -1253,7 +1253,8 @@ static int __br_fdb_delete(struct net_bridge *br,
|
||||||
/* Remove neighbor entry with RTM_DELNEIGH */
|
/* Remove neighbor entry with RTM_DELNEIGH */
|
||||||
int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
|
int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
|
||||||
struct net_device *dev,
|
struct net_device *dev,
|
||||||
const unsigned char *addr, u16 vid)
|
const unsigned char *addr, u16 vid,
|
||||||
|
struct netlink_ext_ack *extack)
|
||||||
{
|
{
|
||||||
struct net_bridge_vlan_group *vg;
|
struct net_bridge_vlan_group *vg;
|
||||||
struct net_bridge_port *p = NULL;
|
struct net_bridge_port *p = NULL;
|
||||||
|
|
|
@ -793,7 +793,8 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
|
||||||
const unsigned char *addr, u16 vid, unsigned long flags);
|
const unsigned char *addr, u16 vid, unsigned long flags);
|
||||||
|
|
||||||
int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
|
int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
|
||||||
struct net_device *dev, const unsigned char *addr, u16 vid);
|
struct net_device *dev, const unsigned char *addr, u16 vid,
|
||||||
|
struct netlink_ext_ack *extack);
|
||||||
int br_fdb_delete_bulk(struct ndmsg *ndm, struct nlattr *tb[],
|
int br_fdb_delete_bulk(struct ndmsg *ndm, struct nlattr *tb[],
|
||||||
struct net_device *dev, u16 vid,
|
struct net_device *dev, u16 vid,
|
||||||
struct netlink_ext_ack *extack);
|
struct netlink_ext_ack *extack);
|
||||||
|
|
|
@ -4258,7 +4258,7 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,
|
||||||
ops = br_dev->netdev_ops;
|
ops = br_dev->netdev_ops;
|
||||||
if (!del_bulk) {
|
if (!del_bulk) {
|
||||||
if (ops->ndo_fdb_del)
|
if (ops->ndo_fdb_del)
|
||||||
err = ops->ndo_fdb_del(ndm, tb, dev, addr, vid);
|
err = ops->ndo_fdb_del(ndm, tb, dev, addr, vid, extack);
|
||||||
} else {
|
} else {
|
||||||
if (ops->ndo_fdb_del_bulk)
|
if (ops->ndo_fdb_del_bulk)
|
||||||
err = ops->ndo_fdb_del_bulk(ndm, tb, dev, vid,
|
err = ops->ndo_fdb_del_bulk(ndm, tb, dev, vid,
|
||||||
|
@ -4276,7 +4276,7 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,
|
||||||
ops = dev->netdev_ops;
|
ops = dev->netdev_ops;
|
||||||
if (!del_bulk) {
|
if (!del_bulk) {
|
||||||
if (ops->ndo_fdb_del)
|
if (ops->ndo_fdb_del)
|
||||||
err = ops->ndo_fdb_del(ndm, tb, dev, addr, vid);
|
err = ops->ndo_fdb_del(ndm, tb, dev, addr, vid, extack);
|
||||||
else
|
else
|
||||||
err = ndo_dflt_fdb_del(ndm, tb, dev, addr, vid);
|
err = ndo_dflt_fdb_del(ndm, tb, dev, addr, vid);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue