diff options
| author | Jiri Benc <jbenc@redhat.com> | 2015-09-17 16:11:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-17 22:32:16 -0700 |
| commit | 1e5b311ab2cc3baf73cdff066ab39c7466bf166b (patch) | |
| tree | 5badff59c0117f8e633cbc10ff1237b10774f723 /drivers/net/ethernet/emulex/benet/be_main.c | |
| parent | 378fddc281072a10b621341b9f78c902303a8fe7 (diff) | |
| download | op-kernel-dev-1e5b311ab2cc3baf73cdff066ab39c7466bf166b.zip op-kernel-dev-1e5b311ab2cc3baf73cdff066ab39c7466bf166b.tar.gz | |
be2net: allow offloading with the same port for IPv4 and IPv6
The callback for adding vxlan port can be called with the same port for both
IPv4 and IPv6. Do not disable the offloading if this occurs.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Sathya Perla <sathya.perla@avagotech.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/emulex/benet/be_main.c')
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 12687bf..7bf51a1 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -5176,6 +5176,11 @@ static void be_add_vxlan_port(struct net_device *netdev, sa_family_t sa_family, if (lancer_chip(adapter) || BEx_chip(adapter) || be_is_mc(adapter)) return; + if (adapter->vxlan_port == port && adapter->vxlan_port_count) { + adapter->vxlan_port_aliases++; + return; + } + if (adapter->flags & BE_FLAGS_VXLAN_OFFLOADS) { dev_info(dev, "Only one UDP port supported for VxLAN offloads\n"); @@ -5226,6 +5231,11 @@ static void be_del_vxlan_port(struct net_device *netdev, sa_family_t sa_family, if (adapter->vxlan_port != port) goto done; + if (adapter->vxlan_port_aliases) { + adapter->vxlan_port_aliases--; + return; + } + be_disable_vxlan_offloads(adapter); dev_info(&adapter->pdev->dev, |
