diff for duplicates of <20190805204331.GA25178@avx2> diff --git a/a/1.txt b/N1/1.txt index c174179..2b946b7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -151,7 +151,7 @@ Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> { struct net_device *ndev = netdev_notifier_info_to_dev(ptr); @@ -3671,7 +3671,7 @@ static int mlx5e_tc_netdev_event(struct notifier_block *this, - ndev->reg_state == NETREG_REGISTERED) + ndev->reg_state = NETREG_REGISTERED) return NOTIFY_DONE; - tc = container_of(this, struct mlx5e_tc_table, netdevice_nb); @@ -277,7 +277,7 @@ Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -3478,7 +3478,7 @@ static bool is_macsec_master(struct net_device *dev) - return rcu_access_pointer(dev->rx_handler) == macsec_handle_frame; + return rcu_access_pointer(dev->rx_handler) = macsec_handle_frame; } -static int macsec_notify(struct notifier_block *this, unsigned long event, @@ -667,7 +667,7 @@ Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> --- a/net/netfilter/nf_nat_masquerade.c +++ b/net/netfilter/nf_nat_masquerade.c @@ -72,7 +72,7 @@ static int device_cmp(struct nf_conn *i, void *ifindex) - return nat->masq_index == (int)(long)ifindex; + return nat->masq_index = (int)(long)ifindex; } -static int masq_device_event(struct notifier_block *this, @@ -676,7 +676,7 @@ Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> void *ptr) { @@ -106,7 +106,7 @@ static int inet_cmp(struct nf_conn *ct, void *ptr) - return ifa->ifa_address == tuple->dst.u3.ip; + return ifa->ifa_address = tuple->dst.u3.ip; } -static int masq_inet_event(struct notifier_block *this, diff --git a/a/content_digest b/N1/content_digest index e24ddc0..f096a91 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Alexey Dobriyan <adobriyan@gmail.com>\0" "Subject\0[PATCH net-next] net: use \"nb\" for notifier blocks\0" - "Date\0Mon, 5 Aug 2019 23:43:31 +0300\0" + "Date\0Mon, 05 Aug 2019 20:43:31 +0000\0" "To\0davem@davemloft.net\0" "Cc\0netdev@vger.kernel.org" netfilter-devel@vger.kernel.org @@ -161,7 +161,7 @@ " {\n" " \tstruct net_device *ndev = netdev_notifier_info_to_dev(ptr);\n" "@@ -3671,7 +3671,7 @@ static int mlx5e_tc_netdev_event(struct notifier_block *this,\n" - " \t ndev->reg_state == NETREG_REGISTERED)\n" + " \t ndev->reg_state = NETREG_REGISTERED)\n" " \t\treturn NOTIFY_DONE;\n" " \n" "-\ttc = container_of(this, struct mlx5e_tc_table, netdevice_nb);\n" @@ -287,7 +287,7 @@ "--- a/drivers/net/macsec.c\n" "+++ b/drivers/net/macsec.c\n" "@@ -3478,7 +3478,7 @@ static bool is_macsec_master(struct net_device *dev)\n" - " \treturn rcu_access_pointer(dev->rx_handler) == macsec_handle_frame;\n" + " \treturn rcu_access_pointer(dev->rx_handler) = macsec_handle_frame;\n" " }\n" " \n" "-static int macsec_notify(struct notifier_block *this, unsigned long event,\n" @@ -677,7 +677,7 @@ "--- a/net/netfilter/nf_nat_masquerade.c\n" "+++ b/net/netfilter/nf_nat_masquerade.c\n" "@@ -72,7 +72,7 @@ static int device_cmp(struct nf_conn *i, void *ifindex)\n" - " \treturn nat->masq_index == (int)(long)ifindex;\n" + " \treturn nat->masq_index = (int)(long)ifindex;\n" " }\n" " \n" "-static int masq_device_event(struct notifier_block *this,\n" @@ -686,7 +686,7 @@ " \t\t\t void *ptr)\n" " {\n" "@@ -106,7 +106,7 @@ static int inet_cmp(struct nf_conn *ct, void *ptr)\n" - " \treturn ifa->ifa_address == tuple->dst.u3.ip;\n" + " \treturn ifa->ifa_address = tuple->dst.u3.ip;\n" " }\n" " \n" "-static int masq_inet_event(struct notifier_block *this,\n" @@ -930,4 +930,4 @@ " {\n" " \tstruct net_device *dev = netdev_notifier_info_to_dev(ptr);" -80002fb762ec935795b1646be19316d678522a84532bafad94d6d20c7708b244 +2815a4d7b93c3c1aa94de3b9f7da86adf66b3179d2c55678db2c9152e8cbd0f1
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.