* [PATCH net] nfp: flower: fix ABI mismatch between driver and firmware
@ 2020-09-02 15:04 Simon Horman
2020-09-02 15:41 ` Jakub Kicinski
2020-09-02 23:00 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Simon Horman @ 2020-09-02 15:04 UTC (permalink / raw)
To: David Miller
Cc: Jakub Kicinski, Louis Peens, netdev, oss-drivers, Simon Horman
From: Louis Peens <louis.peens@netronome.com>
Fix an issue where the driver wrongly detected ipv6 neighbour updates
from the NFP as corrupt. Add a reserved field on the kernel side so
it is similar to the ipv4 version of the struct and has space for the
extra bytes from the card.
Fixes: 9ea9bfa12240 ("nfp: flower: support ipv6 tunnel keep-alive messages from fw")
Signed-off-by: Louis Peens <louis.peens@netronome.com>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
---
drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
index 2df3deedf9fd..7248d248f604 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
@@ -61,6 +61,7 @@ struct nfp_tun_active_tuns {
* @flags: options part of the request
* @tun_info.ipv6: dest IPv6 address of active route
* @tun_info.egress_port: port the encapsulated packet egressed
+ * @tun_info.extra: reserved for future use
* @tun_info: tunnels that have sent traffic in reported period
*/
struct nfp_tun_active_tuns_v6 {
@@ -70,6 +71,7 @@ struct nfp_tun_active_tuns_v6 {
struct route_ip_info_v6 {
struct in6_addr ipv6;
__be32 egress_port;
+ __be32 extra[2];
} tun_info[];
};
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net] nfp: flower: fix ABI mismatch between driver and firmware
2020-09-02 15:04 [PATCH net] nfp: flower: fix ABI mismatch between driver and firmware Simon Horman
@ 2020-09-02 15:41 ` Jakub Kicinski
2020-09-02 23:00 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2020-09-02 15:41 UTC (permalink / raw)
To: Simon Horman; +Cc: David Miller, Louis Peens, netdev, oss-drivers
On Wed, 2 Sep 2020 17:04:58 +0200 Simon Horman wrote:
> From: Louis Peens <louis.peens@netronome.com>
>
> Fix an issue where the driver wrongly detected ipv6 neighbour updates
> from the NFP as corrupt. Add a reserved field on the kernel side so
> it is similar to the ipv4 version of the struct and has space for the
> extra bytes from the card.
>
> Fixes: 9ea9bfa12240 ("nfp: flower: support ipv6 tunnel keep-alive messages from fw")
>
no need for this empty line
> Signed-off-by: Louis Peens <louis.peens@netronome.com>
> Signed-off-by: Simon Horman <simon.horman@netronome.com>
Acked-by: Jakub Kicinski <kuba@kernel.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net] nfp: flower: fix ABI mismatch between driver and firmware
2020-09-02 15:04 [PATCH net] nfp: flower: fix ABI mismatch between driver and firmware Simon Horman
2020-09-02 15:41 ` Jakub Kicinski
@ 2020-09-02 23:00 ` David Miller
2020-09-03 6:42 ` Simon Horman
1 sibling, 1 reply; 4+ messages in thread
From: David Miller @ 2020-09-02 23:00 UTC (permalink / raw)
To: simon.horman; +Cc: kuba, louis.peens, netdev, oss-drivers
From: Simon Horman <simon.horman@netronome.com>
Date: Wed, 2 Sep 2020 17:04:58 +0200
> From: Louis Peens <louis.peens@netronome.com>
>
> Fix an issue where the driver wrongly detected ipv6 neighbour updates
> from the NFP as corrupt. Add a reserved field on the kernel side so
> it is similar to the ipv4 version of the struct and has space for the
> extra bytes from the card.
>
> Fixes: 9ea9bfa12240 ("nfp: flower: support ipv6 tunnel keep-alive messages from fw")
> Signed-off-by: Louis Peens <louis.peens@netronome.com>
> Signed-off-by: Simon Horman <simon.horman@netronome.com>
Applied and queued up for -stable, thanks Simon.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net] nfp: flower: fix ABI mismatch between driver and firmware
2020-09-02 23:00 ` David Miller
@ 2020-09-03 6:42 ` Simon Horman
0 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2020-09-03 6:42 UTC (permalink / raw)
To: David Miller; +Cc: kuba, louis.peens, netdev, oss-drivers
On Wed, Sep 02, 2020 at 04:00:54PM -0700, David Miller wrote:
> From: Simon Horman <simon.horman@netronome.com>
> Date: Wed, 2 Sep 2020 17:04:58 +0200
>
> > From: Louis Peens <louis.peens@netronome.com>
> >
> > Fix an issue where the driver wrongly detected ipv6 neighbour updates
> > from the NFP as corrupt. Add a reserved field on the kernel side so
> > it is similar to the ipv4 version of the struct and has space for the
> > extra bytes from the card.
> >
> > Fixes: 9ea9bfa12240 ("nfp: flower: support ipv6 tunnel keep-alive messages from fw")
> > Signed-off-by: Louis Peens <louis.peens@netronome.com>
> > Signed-off-by: Simon Horman <simon.horman@netronome.com>
>
> Applied and queued up for -stable, thanks Simon.
Great, thanks Dave.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-03 6:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-02 15:04 [PATCH net] nfp: flower: fix ABI mismatch between driver and firmware Simon Horman
2020-09-02 15:41 ` Jakub Kicinski
2020-09-02 23:00 ` David Miller
2020-09-03 6:42 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).