diff options
Diffstat (limited to 'drivers/net/mlx4/mlx4_en.h')
-rw-r--r-- | drivers/net/mlx4/mlx4_en.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h index 0b5150df0585..ed84811766e6 100644 --- a/drivers/net/mlx4/mlx4_en.h +++ b/drivers/net/mlx4/mlx4_en.h | |||
@@ -34,10 +34,12 @@ | |||
34 | #ifndef _MLX4_EN_H_ | 34 | #ifndef _MLX4_EN_H_ |
35 | #define _MLX4_EN_H_ | 35 | #define _MLX4_EN_H_ |
36 | 36 | ||
37 | #include <linux/bitops.h> | ||
37 | #include <linux/compiler.h> | 38 | #include <linux/compiler.h> |
38 | #include <linux/list.h> | 39 | #include <linux/list.h> |
39 | #include <linux/mutex.h> | 40 | #include <linux/mutex.h> |
40 | #include <linux/netdevice.h> | 41 | #include <linux/netdevice.h> |
42 | #include <linux/if_vlan.h> | ||
41 | 43 | ||
42 | #include <linux/mlx4/device.h> | 44 | #include <linux/mlx4/device.h> |
43 | #include <linux/mlx4/qp.h> | 45 | #include <linux/mlx4/qp.h> |
@@ -418,7 +420,7 @@ struct mlx4_en_priv { | |||
418 | struct mlx4_en_dev *mdev; | 420 | struct mlx4_en_dev *mdev; |
419 | struct mlx4_en_port_profile *prof; | 421 | struct mlx4_en_port_profile *prof; |
420 | struct net_device *dev; | 422 | struct net_device *dev; |
421 | struct vlan_group *vlgrp; | 423 | unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]; |
422 | struct net_device_stats stats; | 424 | struct net_device_stats stats; |
423 | struct net_device_stats ret_stats; | 425 | struct net_device_stats ret_stats; |
424 | struct mlx4_en_port_state port_state; | 426 | struct mlx4_en_port_state port_state; |
@@ -553,7 +555,7 @@ int mlx4_en_free_tx_buf(struct net_device *dev, struct mlx4_en_tx_ring *ring); | |||
553 | void mlx4_en_rx_irq(struct mlx4_cq *mcq); | 555 | void mlx4_en_rx_irq(struct mlx4_cq *mcq); |
554 | 556 | ||
555 | int mlx4_SET_MCAST_FLTR(struct mlx4_dev *dev, u8 port, u64 mac, u64 clear, u8 mode); | 557 | int mlx4_SET_MCAST_FLTR(struct mlx4_dev *dev, u8 port, u64 mac, u64 clear, u8 mode); |
556 | int mlx4_SET_VLAN_FLTR(struct mlx4_dev *dev, u8 port, struct vlan_group *grp); | 558 | int mlx4_SET_VLAN_FLTR(struct mlx4_dev *dev, struct mlx4_en_priv *priv); |
557 | int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu, | 559 | int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu, |
558 | u8 pptx, u8 pfctx, u8 pprx, u8 pfcrx); | 560 | u8 pptx, u8 pfctx, u8 pprx, u8 pfcrx); |
559 | int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn, | 561 | int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn, |