diff for duplicates of <78823e29-02b2-e052-e8bb-12bbe692db6a@gmail.com> diff --git a/a/1.txt b/N1/1.txt index e39bd82..1272f47 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,11 +1,11 @@ -On ٢٥/٤/٢٠٢٢ ٠٨:١١, Julia Lawall wrote: +On ???/??/???? ??:??, Julia Lawall wrote: > > On Sun, 24 Apr 2022, Alaa Mohamed wrote: > ->> On ٢٤/٤/٢٠٢٢ ٢١:٥٥, Nikolay Aleksandrov wrote: +>> On ??/?/???? ??:??, Nikolay Aleksandrov wrote: >>> On 24/04/2022 22:49, Alaa Mohamed wrote: ->>>> On ٢٤/٤/٢٠٢٢ ٢١:٠٢, Nikolay Aleksandrov wrote: +>>>> On ??/?/???? ??:??, Nikolay Aleksandrov wrote: >>>>> On 24/04/2022 15:09, Alaa Mohamed wrote: >>>>>> Add extack support to .ndo_fdb_del in netdevice.h and >>>>>> all related methods. @@ -13,18 +13,18 @@ On ٢٥/٤/٢٠٢٢ ٠٨:١١, Julia Lawall wrote: >>>>>> Signed-off-by: Alaa Mohamed <eng.alaamohamedsoliman.am@gmail.com> >>>>>> --- >>>>>> changes in V3: ->>>>>> fix errors reported by checkpatch.pl +>>>>>> ???????? fix errors reported by checkpatch.pl >>>>>> --- ->>>>>> drivers/net/ethernet/intel/ice/ice_main.c | 4 ++-- ->>>>>> drivers/net/ethernet/mscc/ocelot_net.c | 4 ++-- ->>>>>> drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +- ->>>>>> drivers/net/macvlan.c | 2 +- ->>>>>> drivers/net/vxlan/vxlan_core.c | 2 +- ->>>>>> include/linux/netdevice.h | 2 +- ->>>>>> net/bridge/br_fdb.c | 2 +- ->>>>>> net/bridge/br_private.h | 2 +- ->>>>>> net/core/rtnetlink.c | 4 ++-- ->>>>>> 9 files changed, 12 insertions(+), 12 deletions(-) +>>>>>> ? drivers/net/ethernet/intel/ice/ice_main.c??????? | 4 ++-- +>>>>>> ? drivers/net/ethernet/mscc/ocelot_net.c?????????? | 4 ++-- +>>>>>> ? drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +- +>>>>>> ? drivers/net/macvlan.c??????????????????????????? | 2 +- +>>>>>> ? drivers/net/vxlan/vxlan_core.c?????????????????? | 2 +- +>>>>>> ? include/linux/netdevice.h??????????????????????? | 2 +- +>>>>>> ? net/bridge/br_fdb.c????????????????????????????? | 2 +- +>>>>>> ? net/bridge/br_private.h????????????????????????? | 2 +- +>>>>>> ? net/core/rtnetlink.c???????????????????????????? | 4 ++-- +>>>>>> ? 9 files changed, 12 insertions(+), 12 deletions(-) >>>>>> >>>>>> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c >>>>>> b/drivers/net/ethernet/intel/ice/ice_main.c @@ -33,13 +33,13 @@ On ٢٥/٤/٢٠٢٢ ٠٨:١١, Julia Lawall wrote: >>>>>> +++ b/drivers/net/ethernet/intel/ice/ice_main.c >>>>>> @@ -5678,10 +5678,10 @@ ice_fdb_add(struct ndmsg *ndm, struct nlattr >>>>>> __always_unused *tb[], ->>>>>> static int ->>>>>> ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[], ->>>>>> struct net_device *dev, const unsigned char *addr, ->>>>>> - __always_unused u16 vid) ->>>>>> + __always_unused u16 vid, struct netlink_ext_ack *extack) ->>>>>> { ->>>>>> int err; +>>>>>> ? static int +>>>>>> ? ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[], +>>>>>> ????????? struct net_device *dev, const unsigned char *addr, +>>>>>> -??????? __always_unused u16 vid) +>>>>>> +??????? __always_unused u16 vid, struct netlink_ext_ack *extack) +>>>>>> ? { +>>>>>> ????? int err; >>>>>> - >>>>>> + >>>>> What's changed here? @@ -69,9 +69,9 @@ google it , Thanks Julia. > ->>>>>> if (ndm->ndm_state & NUD_PERMANENT) { ->>>>>> netdev_err(dev, "FDB only supports static addresses\n"); ->>>>>> return -EINVAL; +>>>>>> ????? if (ndm->ndm_state & NUD_PERMANENT) { +>>>>>> ????????? netdev_err(dev, "FDB only supports static addresses\n"); +>>>>>> ????????? return -EINVAL; >>>>>> diff --git a/drivers/net/ethernet/mscc/ocelot_net.c >>>>>> b/drivers/net/ethernet/mscc/ocelot_net.c >>>>>> index 247bc105bdd2..e07c64e3159c 100644 @@ -80,25 +80,25 @@ google it , Thanks Julia. >>>>>> @@ -774,14 +774,14 @@ static int ocelot_port_fdb_add(struct ndmsg >>>>>> *ndm, struct nlattr *tb[], >>>>>> ->>>>>> static int ocelot_port_fdb_del(struct ndmsg *ndm, struct nlattr +>>>>>> ? static int ocelot_port_fdb_del(struct ndmsg *ndm, struct nlattr >>>>>> *tb[], ->>>>>> struct net_device *dev, ->>>>>> - const unsigned char *addr, u16 vid) ->>>>>> + const unsigned char *addr, u16 vid, struct +>>>>>> ???????????????????? 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 *ocelot_port = &priv->port; ->>>>>> struct ocelot *ocelot = ocelot_port->ocelot; ->>>>>> int port = priv->chip_port; +>>>>>> ? { +>>>>>> ????? struct ocelot_port_private *priv = netdev_priv(dev); +>>>>>> ????? struct ocelot_port *ocelot_port = &priv->port; +>>>>>> ????? struct ocelot *ocelot = ocelot_port->ocelot; +>>>>>> ????? int port = priv->chip_port; >>>>>> ->>>>>> - return ocelot_fdb_del(ocelot, port, addr, vid, +>>>>>> -??? return ocelot_fdb_del(ocelot, port, addr, vid, >>>>>> ocelot_port->bridge); ->>>>>> + return ocelot_fdb_del(ocelot, port, addr, vid, +>>>>>> +??? return ocelot_fdb_del(ocelot, port, addr, vid, >>>>>> ocelot_port->bridge, extack); ->>>>>> } +>>>>>> ? } >>>>>> ->>>>>> static int ocelot_port_fdb_dump(struct sk_buff *skb, +>>>>>> ? static int ocelot_port_fdb_dump(struct sk_buff *skb, >>>>>> diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c >>>>>> b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c >>>>>> index d320567b2cca..51fa23418f6a 100644 @@ -107,14 +107,14 @@ google it , Thanks Julia. >>>>>> @@ -368,7 +368,7 @@ static int qlcnic_set_mac(struct net_device >>>>>> *netdev, void *p) >>>>>> ->>>>>> static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], ->>>>>> struct net_device *netdev, ->>>>>> - const unsigned char *addr, u16 vid) ->>>>>> + const unsigned char *addr, u16 vid, struct +>>>>>> ? static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], +>>>>>> ????????????? 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); ->>>>>> int err = -EOPNOTSUPP; +>>>>>> ? { +>>>>>> ????? struct qlcnic_adapter *adapter = netdev_priv(netdev); +>>>>>> ????? int err = -EOPNOTSUPP; >>>>>> diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c >>>>>> index 069e8824c264..ffd34d9f7049 100644 >>>>>> --- a/drivers/net/macvlan.c @@ -122,106 +122,106 @@ google it , Thanks Julia. >>>>>> @@ -1017,7 +1017,7 @@ static int macvlan_fdb_add(struct ndmsg *ndm, >>>>>> struct nlattr *tb[], >>>>>> ->>>>>> static int macvlan_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], ->>>>>> struct net_device *dev, ->>>>>> - const unsigned char *addr, u16 vid) ->>>>>> + const unsigned char *addr, u16 vid, struct +>>>>>> ? static int macvlan_fdb_del(struct ndmsg *ndm, struct nlattr *tb[], +>>>>>> ???????????????? 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); ->>>>>> int err = -EINVAL; +>>>>>> ? { +>>>>>> ????? struct macvlan_dev *vlan = netdev_priv(dev); +>>>>>> ????? int err = -EINVAL; >>>>>> diff --git a/drivers/net/vxlan/vxlan_core.c >>>>>> b/drivers/net/vxlan/vxlan_core.c >>>>>> index de97ff98d36e..cf2f60037340 100644 >>>>>> --- a/drivers/net/vxlan/vxlan_core.c >>>>>> +++ b/drivers/net/vxlan/vxlan_core.c >>>>>> @@ -1280,7 +1280,7 @@ int __vxlan_fdb_delete(struct vxlan_dev *vxlan, ->>>>>> /* Delete entry (via netlink) */ ->>>>>> static int vxlan_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], ->>>>>> struct net_device *dev, ->>>>>> - const unsigned char *addr, u16 vid) ->>>>>> + const unsigned char *addr, u16 vid, struct +>>>>>> ? /* Delete entry (via netlink) */ +>>>>>> ? static int vxlan_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], +>>>>>> ????????????????? 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); ->>>>>> union vxlan_addr ip; +>>>>>> ? { +>>>>>> ????? struct vxlan_dev *vxlan = netdev_priv(dev); +>>>>>> ????? union vxlan_addr ip; >>>>>> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h >>>>>> index 28ea4f8269d4..d0d2a8f33c73 100644 >>>>>> --- a/include/linux/netdevice.h >>>>>> +++ b/include/linux/netdevice.h >>>>>> @@ -1509,7 +1509,7 @@ struct net_device_ops { ->>>>>> struct nlattr *tb[], ->>>>>> struct net_device *dev, ->>>>>> const unsigned char *addr, ->>>>>> - u16 vid); ->>>>>> + u16 vid, struct netlink_ext_ack *extack); ->>>>>> int (*ndo_fdb_dump)(struct sk_buff *skb, ->>>>>> struct netlink_callback *cb, ->>>>>> struct net_device *dev, +>>>>>> ???????????????????????????? struct nlattr *tb[], +>>>>>> ???????????????????????????? struct net_device *dev, +>>>>>> ???????????????????????????? const unsigned char *addr, +>>>>>> -?????????????????????????? u16 vid); +>>>>>> +?????????????????????????? u16 vid, struct netlink_ext_ack *extack); +>>>>>> ????? int??????????? (*ndo_fdb_dump)(struct sk_buff *skb, +>>>>>> ????????????????????????? struct netlink_callback *cb, +>>>>>> ????????????????????????? struct net_device *dev, >>>>>> diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c >>>>>> index 6ccda68bd473..5bfce2e9a553 100644 >>>>>> --- a/net/bridge/br_fdb.c >>>>>> +++ b/net/bridge/br_fdb.c >>>>>> @@ -1110,7 +1110,7 @@ static int __br_fdb_delete(struct net_bridge >>>>>> *br, ->>>>>> /* Remove neighbor entry with RTM_DELNEIGH */ ->>>>>> int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], ->>>>>> struct net_device *dev, ->>>>>> - const unsigned char *addr, u16 vid) ->>>>>> + const unsigned char *addr, u16 vid, struct netlink_ext_ack +>>>>>> ? /* Remove neighbor entry with RTM_DELNEIGH */ +>>>>>> ? int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], +>>>>>> ??????????? 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_port *p = NULL; +>>>>>> ? { +>>>>>> ????? struct net_bridge_vlan_group *vg; +>>>>>> ????? struct net_bridge_port *p = NULL; >>>>>> diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h >>>>>> index 18ccc3d5d296..95348c1c9ce5 100644 >>>>>> --- a/net/bridge/br_private.h >>>>>> +++ b/net/bridge/br_private.h >>>>>> @@ -780,7 +780,7 @@ void br_fdb_update(struct net_bridge *br, struct >>>>>> net_bridge_port *source, ->>>>>> const unsigned char *addr, u16 vid, unsigned long +>>>>>> ???????????? const unsigned char *addr, u16 vid, unsigned long >>>>>> flags); >>>>>> ->>>>>> int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], ->>>>>> - struct net_device *dev, const unsigned char *addr, u16 +>>>>>> ? 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 net_device *dev, const unsigned char *addr, u16 vid, >>>>>> struct netlink_ext_ack *extack); >>>>> This is way too long (111 chars) and checkpatch should've complained >>>>> about it. >>>>> WARNING: line length of 111 exceeds 100 columns >>>>> #234: FILE: net/bridge/br_private.h:782: ->>>>> + 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); >>>> I will fix it. >>>> ->>>>>> int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[], struct +>>>>>> ? int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[], struct >>>>>> net_device *dev, ->>>>>> const unsigned char *addr, u16 vid, u16 nlh_flags, ->>>>>> struct netlink_ext_ack *extack); +>>>>>> ???????????? const unsigned char *addr, u16 vid, u16 nlh_flags, +>>>>>> ???????????? struct netlink_ext_ack *extack); >>>>>> diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c >>>>>> index 4041b3e2e8ec..99b30ae58a47 100644 >>>>>> --- a/net/core/rtnetlink.c >>>>>> +++ b/net/core/rtnetlink.c >>>>>> @@ -4223,7 +4223,7 @@ static int rtnl_fdb_del(struct sk_buff *skb, >>>>>> struct nlmsghdr *nlh, ->>>>>> const struct net_device_ops *ops = br_dev->netdev_ops; +>>>>>> ????????? const struct net_device_ops *ops = br_dev->netdev_ops; >>>>>> ->>>>>> 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); +>>>>>> ????????? 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); >>>>>> ->>>>>> if (err) ->>>>>> goto out; +>>>>>> ????????? if (err) +>>>>>> ????????????? goto out; >>>>>> @@ -4235,7 +4235,7 @@ static int rtnl_fdb_del(struct sk_buff *skb, >>>>>> struct nlmsghdr *nlh, ->>>>>> if (ndm->ndm_flags & NTF_SELF) { ->>>>>> if (dev->netdev_ops->ndo_fdb_del) ->>>>>> err = dev->netdev_ops->ndo_fdb_del(ndm, tb, dev, addr, ->>>>>> - vid); ->>>>>> + vid, extack); ->>>>>> else ->>>>>> err = ndo_dflt_fdb_del(ndm, tb, dev, addr, vid); +>>>>>> ????? if (ndm->ndm_flags & NTF_SELF) { +>>>>>> ????????? if (dev->netdev_ops->ndo_fdb_del) +>>>>>> ????????????? err = dev->netdev_ops->ndo_fdb_del(ndm, tb, dev, addr, +>>>>>> -?????????????????????????????? vid); +>>>>>> +?????????????????????????????? vid, extack); +>>>>>> ????????? else +>>>>>> ????????????? err = ndo_dflt_fdb_del(ndm, tb, dev, addr, vid); >>>>>> >>>>>> -- >>>>>> 2.36.0 diff --git a/a/content_digest b/N1/content_digest index 4d59b3a..9e6eba4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,40 +6,19 @@ "ref\03bcb2d3d-8b8b-8a8f-1285-7277394b4e6b@gmail.com\0" "ref\0alpine.DEB.2.22.394.2204250808280.2759@hadrien\0" "From\0Alaa Mohamed <eng.alaamohamedsoliman.am@gmail.com>\0" - "Subject\0Re: [Bridge] [PATCH net-next v3 1/2] rtnetlink: add extack support in fdb del handlers\0" + "Subject\0[Intel-wired-lan] [PATCH net-next v3 1/2] rtnetlink: add extack support in fdb del handlers\0" "Date\0Mon, 25 Apr 2022 13:51:23 +0200\0" - "To\0Julia Lawall <julia.lawall@inria.fr>\0" - "Cc\0shshaikh@marvell.com" - jdenham@redhat.com - GR-Linux-NIC-Dev@marvell.com - manishc@marvell.com - alexandre.belloni@bootlin.com - outreachy@lists.linux.dev - netdev@vger.kernel.org - Nikolay Aleksandrov <razor@blackwall.org> - bridge@lists.linux-foundation.org - jesse.brandeburg@intel.com - linux-kernel@vger.kernel.org - vladimir.oltean@nxp.com - sbrivio@redhat.com - claudiu.manoil@nxp.com - anthony.l.nguyen@intel.com - roopa@nvidia.com - kuba@kernel.org - pabeni@redhat.com - davem@davemloft.net - UNGLinuxDriver@microchip.com - " intel-wired-lan@lists.osuosl.org\0" + "To\0intel-wired-lan@osuosl.org\0" "\00:1\0" "b\0" "\n" - "On \331\242\331\245\342\200\217/\331\244\342\200\217/\331\242\331\240\331\242\331\242 \331\240\331\250:\331\241\331\241, Julia Lawall wrote:\n" + "On ???/??/???? ??:??, Julia Lawall wrote:\n" ">\n" "> On Sun, 24 Apr 2022, Alaa Mohamed wrote:\n" ">\n" - ">> On \331\242\331\244/\331\244/\331\242\331\240\331\242\331\242 \331\242\331\241:\331\245\331\245, Nikolay Aleksandrov wrote:\n" + ">> On ??/?/???? ??:??, Nikolay Aleksandrov wrote:\n" ">>> On 24/04/2022 22:49, Alaa Mohamed wrote:\n" - ">>>> On \331\242\331\244/\331\244/\331\242\331\240\331\242\331\242 \331\242\331\241:\331\240\331\242, Nikolay Aleksandrov wrote:\n" + ">>>> On ??/?/???? ??:??, Nikolay Aleksandrov wrote:\n" ">>>>> On 24/04/2022 15:09, Alaa Mohamed wrote:\n" ">>>>>> Add extack support to .ndo_fdb_del in netdevice.h and\n" ">>>>>> all related methods.\n" @@ -47,18 +26,18 @@ ">>>>>> Signed-off-by: Alaa Mohamed <eng.alaamohamedsoliman.am@gmail.com>\n" ">>>>>> ---\n" ">>>>>> changes in V3:\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 fix errors reported by checkpatch.pl\n" + ">>>>>> ???????? fix errors reported by checkpatch.pl\n" ">>>>>> ---\n" - ">>>>>> \302\240 drivers/net/ethernet/intel/ice/ice_main.c\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | 4 ++--\n" - ">>>>>> \302\240 drivers/net/ethernet/mscc/ocelot_net.c\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | 4 ++--\n" - ">>>>>> \302\240 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +-\n" - ">>>>>> \302\240 drivers/net/macvlan.c\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | 2 +-\n" - ">>>>>> \302\240 drivers/net/vxlan/vxlan_core.c\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | 2 +-\n" - ">>>>>> \302\240 include/linux/netdevice.h\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | 2 +-\n" - ">>>>>> \302\240 net/bridge/br_fdb.c\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | 2 +-\n" - ">>>>>> \302\240 net/bridge/br_private.h\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | 2 +-\n" - ">>>>>> \302\240 net/core/rtnetlink.c\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 | 4 ++--\n" - ">>>>>> \302\240 9 files changed, 12 insertions(+), 12 deletions(-)\n" + ">>>>>> ? drivers/net/ethernet/intel/ice/ice_main.c??????? | 4 ++--\n" + ">>>>>> ? drivers/net/ethernet/mscc/ocelot_net.c?????????? | 4 ++--\n" + ">>>>>> ? drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +-\n" + ">>>>>> ? drivers/net/macvlan.c??????????????????????????? | 2 +-\n" + ">>>>>> ? drivers/net/vxlan/vxlan_core.c?????????????????? | 2 +-\n" + ">>>>>> ? include/linux/netdevice.h??????????????????????? | 2 +-\n" + ">>>>>> ? net/bridge/br_fdb.c????????????????????????????? | 2 +-\n" + ">>>>>> ? net/bridge/br_private.h????????????????????????? | 2 +-\n" + ">>>>>> ? net/core/rtnetlink.c???????????????????????????? | 4 ++--\n" + ">>>>>> ? 9 files changed, 12 insertions(+), 12 deletions(-)\n" ">>>>>>\n" ">>>>>> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c\n" ">>>>>> b/drivers/net/ethernet/intel/ice/ice_main.c\n" @@ -67,13 +46,13 @@ ">>>>>> +++ b/drivers/net/ethernet/intel/ice/ice_main.c\n" ">>>>>> @@ -5678,10 +5678,10 @@ ice_fdb_add(struct ndmsg *ndm, struct nlattr\n" ">>>>>> __always_unused *tb[],\n" - ">>>>>> \302\240 static int\n" - ">>>>>> \302\240 ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct net_device *dev, const unsigned char *addr,\n" - ">>>>>> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240 __always_unused u16 vid)\n" - ">>>>>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240 __always_unused u16 vid, struct netlink_ext_ack *extack)\n" - ">>>>>> \302\240 {\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240 int err;\n" + ">>>>>> ? static int\n" + ">>>>>> ? ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],\n" + ">>>>>> ????????? struct net_device *dev, const unsigned char *addr,\n" + ">>>>>> -??????? __always_unused u16 vid)\n" + ">>>>>> +??????? __always_unused u16 vid, struct netlink_ext_ack *extack)\n" + ">>>>>> ? {\n" + ">>>>>> ????? int err;\n" ">>>>>> -\n" ">>>>>> +\n" ">>>>> What's changed here?\n" @@ -103,9 +82,9 @@ "\n" "\n" ">\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240 if (ndm->ndm_state & NUD_PERMANENT) {\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 netdev_err(dev, \"FDB only supports static addresses\\n\");\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 return -EINVAL;\n" + ">>>>>> ????? if (ndm->ndm_state & NUD_PERMANENT) {\n" + ">>>>>> ????????? netdev_err(dev, \"FDB only supports static addresses\\n\");\n" + ">>>>>> ????????? return -EINVAL;\n" ">>>>>> diff --git a/drivers/net/ethernet/mscc/ocelot_net.c\n" ">>>>>> b/drivers/net/ethernet/mscc/ocelot_net.c\n" ">>>>>> index 247bc105bdd2..e07c64e3159c 100644\n" @@ -114,25 +93,25 @@ ">>>>>> @@ -774,14 +774,14 @@ static int ocelot_port_fdb_add(struct ndmsg\n" ">>>>>> *ndm, struct nlattr *tb[],\n" ">>>>>>\n" - ">>>>>> \302\240 static int ocelot_port_fdb_del(struct ndmsg *ndm, struct nlattr\n" + ">>>>>> ? static int ocelot_port_fdb_del(struct ndmsg *ndm, struct nlattr\n" ">>>>>> *tb[],\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct net_device *dev,\n" - ">>>>>> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 const unsigned char *addr, u16 vid)\n" - ">>>>>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 const unsigned char *addr, u16 vid, struct\n" + ">>>>>> ???????????????????? struct net_device *dev,\n" + ">>>>>> -?????????????????? const unsigned char *addr, u16 vid)\n" + ">>>>>> +?????????????????? const unsigned char *addr, u16 vid, struct\n" ">>>>>> netlink_ext_ack *extack)\n" - ">>>>>> \302\240 {\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240 struct ocelot_port_private *priv = netdev_priv(dev);\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240 struct ocelot_port *ocelot_port = &priv->port;\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240 struct ocelot *ocelot = ocelot_port->ocelot;\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240 int port = priv->chip_port;\n" + ">>>>>> ? {\n" + ">>>>>> ????? struct ocelot_port_private *priv = netdev_priv(dev);\n" + ">>>>>> ????? struct ocelot_port *ocelot_port = &priv->port;\n" + ">>>>>> ????? struct ocelot *ocelot = ocelot_port->ocelot;\n" + ">>>>>> ????? int port = priv->chip_port;\n" ">>>>>>\n" - ">>>>>> -\302\240\302\240\302\240 return ocelot_fdb_del(ocelot, port, addr, vid,\n" + ">>>>>> -??? return ocelot_fdb_del(ocelot, port, addr, vid,\n" ">>>>>> ocelot_port->bridge);\n" - ">>>>>> +\302\240\302\240\302\240 return ocelot_fdb_del(ocelot, port, addr, vid,\n" + ">>>>>> +??? return ocelot_fdb_del(ocelot, port, addr, vid,\n" ">>>>>> ocelot_port->bridge, extack);\n" - ">>>>>> \302\240 }\n" + ">>>>>> ? }\n" ">>>>>>\n" - ">>>>>> \302\240 static int ocelot_port_fdb_dump(struct sk_buff *skb,\n" + ">>>>>> ? static int ocelot_port_fdb_dump(struct sk_buff *skb,\n" ">>>>>> diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c\n" ">>>>>> b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c\n" ">>>>>> index d320567b2cca..51fa23418f6a 100644\n" @@ -141,14 +120,14 @@ ">>>>>> @@ -368,7 +368,7 @@ static int qlcnic_set_mac(struct net_device\n" ">>>>>> *netdev, void *p)\n" ">>>>>>\n" - ">>>>>> \302\240 static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct net_device *netdev,\n" - ">>>>>> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 const unsigned char *addr, u16 vid)\n" - ">>>>>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 const unsigned char *addr, u16 vid, struct\n" + ">>>>>> ? static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],\n" + ">>>>>> ????????????? struct net_device *netdev,\n" + ">>>>>> -??????????? const unsigned char *addr, u16 vid)\n" + ">>>>>> +??????????? const unsigned char *addr, u16 vid, struct\n" ">>>>>> netlink_ext_ack *extack)\n" - ">>>>>> \302\240 {\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240 struct qlcnic_adapter *adapter = netdev_priv(netdev);\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240 int err = -EOPNOTSUPP;\n" + ">>>>>> ? {\n" + ">>>>>> ????? struct qlcnic_adapter *adapter = netdev_priv(netdev);\n" + ">>>>>> ????? int err = -EOPNOTSUPP;\n" ">>>>>> diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c\n" ">>>>>> index 069e8824c264..ffd34d9f7049 100644\n" ">>>>>> --- a/drivers/net/macvlan.c\n" @@ -156,110 +135,110 @@ ">>>>>> @@ -1017,7 +1017,7 @@ static int macvlan_fdb_add(struct ndmsg *ndm,\n" ">>>>>> struct nlattr *tb[],\n" ">>>>>>\n" - ">>>>>> \302\240 static int macvlan_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct net_device *dev,\n" - ">>>>>> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 const unsigned char *addr, u16 vid)\n" - ">>>>>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 const unsigned char *addr, u16 vid, struct\n" + ">>>>>> ? static int macvlan_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],\n" + ">>>>>> ???????????????? struct net_device *dev,\n" + ">>>>>> -?????????????? const unsigned char *addr, u16 vid)\n" + ">>>>>> +?????????????? const unsigned char *addr, u16 vid, struct\n" ">>>>>> netlink_ext_ack *extack)\n" - ">>>>>> \302\240 {\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240 struct macvlan_dev *vlan = netdev_priv(dev);\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240 int err = -EINVAL;\n" + ">>>>>> ? {\n" + ">>>>>> ????? struct macvlan_dev *vlan = netdev_priv(dev);\n" + ">>>>>> ????? int err = -EINVAL;\n" ">>>>>> diff --git a/drivers/net/vxlan/vxlan_core.c\n" ">>>>>> b/drivers/net/vxlan/vxlan_core.c\n" ">>>>>> index de97ff98d36e..cf2f60037340 100644\n" ">>>>>> --- a/drivers/net/vxlan/vxlan_core.c\n" ">>>>>> +++ b/drivers/net/vxlan/vxlan_core.c\n" ">>>>>> @@ -1280,7 +1280,7 @@ int __vxlan_fdb_delete(struct vxlan_dev *vxlan,\n" - ">>>>>> \302\240 /* Delete entry (via netlink) */\n" - ">>>>>> \302\240 static int vxlan_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct net_device *dev,\n" - ">>>>>> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 const unsigned char *addr, u16 vid)\n" - ">>>>>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 const unsigned char *addr, u16 vid, struct\n" + ">>>>>> ? /* Delete entry (via netlink) */\n" + ">>>>>> ? static int vxlan_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],\n" + ">>>>>> ????????????????? struct net_device *dev,\n" + ">>>>>> -??????????????? const unsigned char *addr, u16 vid)\n" + ">>>>>> +??????????????? const unsigned char *addr, u16 vid, struct\n" ">>>>>> netlink_ext_ack *extack)\n" - ">>>>>> \302\240 {\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240 struct vxlan_dev *vxlan = netdev_priv(dev);\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240 union vxlan_addr ip;\n" + ">>>>>> ? {\n" + ">>>>>> ????? struct vxlan_dev *vxlan = netdev_priv(dev);\n" + ">>>>>> ????? union vxlan_addr ip;\n" ">>>>>> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h\n" ">>>>>> index 28ea4f8269d4..d0d2a8f33c73 100644\n" ">>>>>> --- a/include/linux/netdevice.h\n" ">>>>>> +++ b/include/linux/netdevice.h\n" ">>>>>> @@ -1509,7 +1509,7 @@ struct net_device_ops {\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct nlattr *tb[],\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct net_device *dev,\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 const unsigned char *addr,\n" - ">>>>>> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 u16 vid);\n" - ">>>>>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 u16 vid, struct netlink_ext_ack *extack);\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240 int\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 (*ndo_fdb_dump)(struct sk_buff *skb,\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct netlink_callback *cb,\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct net_device *dev,\n" + ">>>>>> ???????????????????????????? struct nlattr *tb[],\n" + ">>>>>> ???????????????????????????? struct net_device *dev,\n" + ">>>>>> ???????????????????????????? const unsigned char *addr,\n" + ">>>>>> -?????????????????????????? u16 vid);\n" + ">>>>>> +?????????????????????????? u16 vid, struct netlink_ext_ack *extack);\n" + ">>>>>> ????? int??????????? (*ndo_fdb_dump)(struct sk_buff *skb,\n" + ">>>>>> ????????????????????????? struct netlink_callback *cb,\n" + ">>>>>> ????????????????????????? struct net_device *dev,\n" ">>>>>> diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c\n" ">>>>>> index 6ccda68bd473..5bfce2e9a553 100644\n" ">>>>>> --- a/net/bridge/br_fdb.c\n" ">>>>>> +++ b/net/bridge/br_fdb.c\n" ">>>>>> @@ -1110,7 +1110,7 @@ static int __br_fdb_delete(struct net_bridge\n" ">>>>>> *br,\n" - ">>>>>> \302\240 /* Remove neighbor entry with RTM_DELNEIGH */\n" - ">>>>>> \302\240 int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct net_device *dev,\n" - ">>>>>> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 const unsigned char *addr, u16 vid)\n" - ">>>>>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 const unsigned char *addr, u16 vid, struct netlink_ext_ack\n" + ">>>>>> ? /* Remove neighbor entry with RTM_DELNEIGH */\n" + ">>>>>> ? int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],\n" + ">>>>>> ??????????? struct net_device *dev,\n" + ">>>>>> -????????? const unsigned char *addr, u16 vid)\n" + ">>>>>> +????????? const unsigned char *addr, u16 vid, struct netlink_ext_ack\n" ">>>>>> *extack)\n" - ">>>>>> \302\240 {\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240 struct net_bridge_vlan_group *vg;\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240 struct net_bridge_port *p = NULL;\n" + ">>>>>> ? {\n" + ">>>>>> ????? struct net_bridge_vlan_group *vg;\n" + ">>>>>> ????? struct net_bridge_port *p = NULL;\n" ">>>>>> diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h\n" ">>>>>> index 18ccc3d5d296..95348c1c9ce5 100644\n" ">>>>>> --- a/net/bridge/br_private.h\n" ">>>>>> +++ b/net/bridge/br_private.h\n" ">>>>>> @@ -780,7 +780,7 @@ void br_fdb_update(struct net_bridge *br, struct\n" ">>>>>> net_bridge_port *source,\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 const unsigned char *addr, u16 vid, unsigned long\n" + ">>>>>> ???????????? const unsigned char *addr, u16 vid, unsigned long\n" ">>>>>> flags);\n" ">>>>>>\n" - ">>>>>> \302\240 int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],\n" - ">>>>>> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct net_device *dev, const unsigned char *addr, u16\n" + ">>>>>> ? int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],\n" + ">>>>>> -????????? struct net_device *dev, const unsigned char *addr, u16\n" ">>>>>> vid);\n" - ">>>>>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct net_device *dev, const unsigned char *addr, u16 vid,\n" + ">>>>>> +????????? struct net_device *dev, const unsigned char *addr, u16 vid,\n" ">>>>>> struct netlink_ext_ack *extack);\n" ">>>>> This is way too long (111 chars) and checkpatch should've complained\n" ">>>>> about it.\n" ">>>>> WARNING: line length of 111 exceeds 100 columns\n" ">>>>> #234: FILE: net/bridge/br_private.h:782:\n" - ">>>>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct net_device *dev, const unsigned char *addr, u16 vid,\n" + ">>>>> +????????? struct net_device *dev, const unsigned char *addr, u16 vid,\n" ">>>>> struct netlink_ext_ack *extack);\n" ">>>> I will fix it.\n" ">>>>\n" - ">>>>>> \302\240 int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[], struct\n" + ">>>>>> ? int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[], struct\n" ">>>>>> net_device *dev,\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 const unsigned char *addr, u16 vid, u16 nlh_flags,\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 struct netlink_ext_ack *extack);\n" + ">>>>>> ???????????? const unsigned char *addr, u16 vid, u16 nlh_flags,\n" + ">>>>>> ???????????? struct netlink_ext_ack *extack);\n" ">>>>>> diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c\n" ">>>>>> index 4041b3e2e8ec..99b30ae58a47 100644\n" ">>>>>> --- a/net/core/rtnetlink.c\n" ">>>>>> +++ b/net/core/rtnetlink.c\n" ">>>>>> @@ -4223,7 +4223,7 @@ static int rtnl_fdb_del(struct sk_buff *skb,\n" ">>>>>> struct nlmsghdr *nlh,\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 const struct net_device_ops *ops = br_dev->netdev_ops;\n" + ">>>>>> ????????? const struct net_device_ops *ops = br_dev->netdev_ops;\n" ">>>>>>\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 if (ops->ndo_fdb_del)\n" - ">>>>>> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 err = ops->ndo_fdb_del(ndm, tb, dev, addr, vid);\n" - ">>>>>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 err = ops->ndo_fdb_del(ndm, tb, dev, addr, vid, extack);\n" + ">>>>>> ????????? if (ops->ndo_fdb_del)\n" + ">>>>>> -??????????? err = ops->ndo_fdb_del(ndm, tb, dev, addr, vid);\n" + ">>>>>> +??????????? err = ops->ndo_fdb_del(ndm, tb, dev, addr, vid, extack);\n" ">>>>>>\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 if (err)\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 goto out;\n" + ">>>>>> ????????? if (err)\n" + ">>>>>> ????????????? goto out;\n" ">>>>>> @@ -4235,7 +4235,7 @@ static int rtnl_fdb_del(struct sk_buff *skb,\n" ">>>>>> struct nlmsghdr *nlh,\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240 if (ndm->ndm_flags & NTF_SELF) {\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 if (dev->netdev_ops->ndo_fdb_del)\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 err = dev->netdev_ops->ndo_fdb_del(ndm, tb, dev, addr,\n" - ">>>>>> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 vid);\n" - ">>>>>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 vid, extack);\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 else\n" - ">>>>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 err = ndo_dflt_fdb_del(ndm, tb, dev, addr, vid);\n" + ">>>>>> ????? if (ndm->ndm_flags & NTF_SELF) {\n" + ">>>>>> ????????? if (dev->netdev_ops->ndo_fdb_del)\n" + ">>>>>> ????????????? err = dev->netdev_ops->ndo_fdb_del(ndm, tb, dev, addr,\n" + ">>>>>> -?????????????????????????????? vid);\n" + ">>>>>> +?????????????????????????????? vid, extack);\n" + ">>>>>> ????????? else\n" + ">>>>>> ????????????? err = ndo_dflt_fdb_del(ndm, tb, dev, addr, vid);\n" ">>>>>>\n" ">>>>>> --\n" ">>>>>> 2.36.0\n" ">>>>>>\n" > > -a2b5e8fb83d939c97beee072305bed85d76125af2a8b502e61dca915e59e0b89 +d162799dcaa1b4012f9b7c1633fb05cfe551be56e4082a4631d8455c927f39c0
diff --git a/a/content_digest b/N2/content_digest index 4d59b3a..3b007da 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,30 +6,30 @@ "ref\03bcb2d3d-8b8b-8a8f-1285-7277394b4e6b@gmail.com\0" "ref\0alpine.DEB.2.22.394.2204250808280.2759@hadrien\0" "From\0Alaa Mohamed <eng.alaamohamedsoliman.am@gmail.com>\0" - "Subject\0Re: [Bridge] [PATCH net-next v3 1/2] rtnetlink: add extack support in fdb del handlers\0" + "Subject\0Re: [PATCH net-next v3 1/2] rtnetlink: add extack support in fdb del handlers\0" "Date\0Mon, 25 Apr 2022 13:51:23 +0200\0" "To\0Julia Lawall <julia.lawall@inria.fr>\0" - "Cc\0shshaikh@marvell.com" - jdenham@redhat.com - GR-Linux-NIC-Dev@marvell.com - manishc@marvell.com - alexandre.belloni@bootlin.com - outreachy@lists.linux.dev + "Cc\0Nikolay Aleksandrov <razor@blackwall.org>" netdev@vger.kernel.org - Nikolay Aleksandrov <razor@blackwall.org> - bridge@lists.linux-foundation.org - jesse.brandeburg@intel.com - linux-kernel@vger.kernel.org - vladimir.oltean@nxp.com + outreachy@lists.linux.dev + roopa@nvidia.com + jdenham@redhat.com sbrivio@redhat.com - claudiu.manoil@nxp.com + jesse.brandeburg@intel.com anthony.l.nguyen@intel.com - roopa@nvidia.com + davem@davemloft.net kuba@kernel.org pabeni@redhat.com - davem@davemloft.net + vladimir.oltean@nxp.com + claudiu.manoil@nxp.com + alexandre.belloni@bootlin.com + shshaikh@marvell.com + manishc@marvell.com + intel-wired-lan@lists.osuosl.org + linux-kernel@vger.kernel.org UNGLinuxDriver@microchip.com - " intel-wired-lan@lists.osuosl.org\0" + GR-Linux-NIC-Dev@marvell.com + " bridge@lists.linux-foundation.org\0" "\00:1\0" "b\0" "\n" @@ -262,4 +262,4 @@ ">>>>>>\n" > > -a2b5e8fb83d939c97beee072305bed85d76125af2a8b502e61dca915e59e0b89 +06c88eb95cd8281e1cbc146bfc39c27029a2896b27720fc1ae9ab599a41dbd6d
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.