diff options
| author | Saeed Mahameed <saeedm@mellanox.com> | 2014-10-27 12:37:42 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-29 00:18:01 +0300 |
| commit | 7787fa661b8b9acba95ba35974b7092675baee8a (patch) | |
| tree | 2f176c544b3c09d536e7bd9305d686276d36b557 /drivers/net/ethernet/mellanox/mlx4/en_netdev.c | |
| parent | d48b3ab4c0e4356f3b1ccaea8cb838cf1292f7da (diff) | |
| download | linux-7787fa661b8b9acba95ba35974b7092675baee8a.tar.xz | |
net/mlx4_en: Add support for setting rxvlan offload OFF/ON
Rename mlx4_en_timestamp_config to mlx4_en_reset_config and extend it to support
choosing RX vlan offload configuration.
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/en_netdev.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index f3032fec8fce..c4bd2c7a8d2e 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -2157,7 +2157,7 @@ static int mlx4_en_hwtstamp_set(struct net_device *dev, struct ifreq *ifr) return -ERANGE; } - if (mlx4_en_timestamp_config(dev, config.tx_type, config.rx_filter)) { + if (mlx4_en_reset_config(dev, config, dev->features)) { config.tx_type = HWTSTAMP_TX_OFF; config.rx_filter = HWTSTAMP_FILTER_NONE; } |