Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21e84257 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6

parents d18cd551 a38a104d

drivers/net/ixgbe/ixgbe.h

+23 −6
Original line number Diff line number Diff line
@@ -482,6 +482,17 @@ struct ixgbe_adapter { 
	struct vf_macvlans vf_mvs;

	struct vf_macvlans *mv_list;

	bool antispoofing_enabled;



	struct hlist_head fdir_filter_list;

	union ixgbe_atr_input fdir_mask;

	int fdir_filter_count;

};



struct ixgbe_fdir_filter {

	struct hlist_node fdir_node;

	union ixgbe_atr_input filter;

	u16 sw_idx;

	u16 action;

};



enum ixbge_state_t {
@@ -543,16 +554,22 @@ extern void ixgbe_alloc_rx_buffers(struct ixgbe_ring *, u16); 
extern void ixgbe_write_eitr(struct ixgbe_q_vector *);

extern int ethtool_ioctl(struct ifreq *ifr);

extern s32 ixgbe_reinit_fdir_tables_82599(struct ixgbe_hw *hw);

extern s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 pballoc);

extern s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 pballoc);

extern s32 ixgbe_init_fdir_signature_82599(struct ixgbe_hw *hw, u32 fdirctrl);

extern s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 fdirctrl);

extern s32 ixgbe_fdir_add_signature_filter_82599(struct ixgbe_hw *hw,

						 union ixgbe_atr_hash_dword input,

						 union ixgbe_atr_hash_dword common,

                                                 u8 queue);

extern s32 ixgbe_fdir_add_perfect_filter_82599(struct ixgbe_hw *hw,

extern s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw,

					   union ixgbe_atr_input *input_mask);

extern s32 ixgbe_fdir_write_perfect_filter_82599(struct ixgbe_hw *hw,

						 union ixgbe_atr_input *input,

                                      struct ixgbe_atr_input_masks *input_masks,

						 u16 soft_id, u8 queue);

extern s32 ixgbe_fdir_erase_perfect_filter_82599(struct ixgbe_hw *hw,

						 union ixgbe_atr_input *input,

						 u16 soft_id);

extern void ixgbe_atr_compute_perfect_hash_82599(union ixgbe_atr_input *input,

						 union ixgbe_atr_input *mask);

extern void ixgbe_configure_rscctl(struct ixgbe_adapter *adapter,

                                   struct ixgbe_ring *ring);

extern void ixgbe_clear_rscctl(struct ixgbe_adapter *adapter,