| Message ID | 20190815001043.153874-1-wsommerfeld@google.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | ipvlan: set hw_enc_features like macvlan | expand |
On Wed, Aug 14, 2019 at 5:10 PM Bill Sommerfeld <wsommerfeld@google.com> wrote: > > Allow encapsulated packets sent to tunnels layered over ipvlan to use > offloads rather than forcing SW fallbacks. > > Since commit f21e5077010acda73a60 ("macvlan: add offload features for > encapsulation"), macvlan has set dev->hw_enc_features to include > everything in dev->features; do likewise in ipvlan. > Thanks Bill > Signed-off-by: Bill Sommerfeld <wsommerfeld@google.com> Acked-by: Mahesh Bandewar <maheshb@google.com> > --- > drivers/net/ipvlan/ipvlan_main.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c > index 1c96bed5a7c4..887bbba4631e 100644 > --- a/drivers/net/ipvlan/ipvlan_main.c > +++ b/drivers/net/ipvlan/ipvlan_main.c > @@ -126,6 +126,7 @@ static int ipvlan_init(struct net_device *dev) > (phy_dev->state & IPVLAN_STATE_MASK); > dev->features = phy_dev->features & IPVLAN_FEATURES; > dev->features |= NETIF_F_LLTX | NETIF_F_VLAN_CHALLENGED; > + dev->hw_enc_features |= dev->features; > dev->gso_max_size = phy_dev->gso_max_size; > dev->gso_max_segs = phy_dev->gso_max_segs; > dev->hard_header_len = phy_dev->hard_header_len; > -- > 2.23.0.rc1.153.gdeed80330f-goog >
From: Bill Sommerfeld <wsommerfeld@google.com> Date: Wed, 14 Aug 2019 17:10:43 -0700 > Allow encapsulated packets sent to tunnels layered over ipvlan to use > offloads rather than forcing SW fallbacks. > > Since commit f21e5077010acda73a60 ("macvlan: add offload features for > encapsulation"), macvlan has set dev->hw_enc_features to include > everything in dev->features; do likewise in ipvlan. > > Signed-off-by: Bill Sommerfeld <wsommerfeld@google.com> Applied to net-next.
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c index 1c96bed5a7c4..887bbba4631e 100644 --- a/drivers/net/ipvlan/ipvlan_main.c +++ b/drivers/net/ipvlan/ipvlan_main.c @@ -126,6 +126,7 @@ static int ipvlan_init(struct net_device *dev) (phy_dev->state & IPVLAN_STATE_MASK); dev->features = phy_dev->features & IPVLAN_FEATURES; dev->features |= NETIF_F_LLTX | NETIF_F_VLAN_CHALLENGED; + dev->hw_enc_features |= dev->features; dev->gso_max_size = phy_dev->gso_max_size; dev->gso_max_segs = phy_dev->gso_max_segs; dev->hard_header_len = phy_dev->hard_header_len;
Allow encapsulated packets sent to tunnels layered over ipvlan to use offloads rather than forcing SW fallbacks. Since commit f21e5077010acda73a60 ("macvlan: add offload features for encapsulation"), macvlan has set dev->hw_enc_features to include everything in dev->features; do likewise in ipvlan. Signed-off-by: Bill Sommerfeld <wsommerfeld@google.com> --- drivers/net/ipvlan/ipvlan_main.c | 1 + 1 file changed, 1 insertion(+)