diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2019-03-20 14:50:04 +0000 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2019-03-20 14:50:10 +0000 |
| commit | 36e178648f46ea9fb63d89097c59ce45fb8a67fe (patch) | |
| tree | e3ee0ea25a45aa28918dc721dd1fe19b27d6849c /drivers/net/enic/enic_main.c | |
| parent | 1ab31fb74132eabd45f326413eb6e4f647de48d9 (diff) | |
| parent | f7a9461e29147c47ce2bb81bd157ac1833cf5eb1 (diff) | |
Merge tag 'upstream/16.11.9' into 16.11.x
Upstream version 16.11.9
Change-Id: I947c2532ec89a9850d135bde544b4d5812b49e4f
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'drivers/net/enic/enic_main.c')
| -rw-r--r-- | drivers/net/enic/enic_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 17606238..f687b3fc 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -1394,8 +1394,10 @@ int enic_probe(struct enic *enic) } /* Set ingress vlan rewrite mode before vnic initialization */ + dev_debug(enic, "Set ig_vlan_rewrite_mode=%u\n", + enic->ig_vlan_rewrite_mode); err = vnic_dev_set_ig_vlan_rewrite_mode(enic->vdev, - IG_VLAN_REWRITE_MODE_PASS_THRU); + enic->ig_vlan_rewrite_mode); if (err) { dev_err(enic, "Failed to set ingress vlan rewrite mode, aborting.\n"); |