From 1d38565918a35ae85dbc9da715a58cd9fd2bd449 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Sat, 14 May 2011 01:16:02 +0000 Subject: [PATCH] --- yaml --- r: 255677 b: refs/heads/master c: 1f4d51836f5e49f2e5201f1daf90239c04b3faf2 h: refs/heads/master i: 255675: c486c8ebd8687e17e3550d6d7f67ad8339853fb6 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_ethtool.c | 2 ++ trunk/drivers/net/ixgbe/ixgbe_main.c | 8 +++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7d8d72f69d88..c6b8c29d2cc6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ba279e2f72a9112a2536eabc8fae5413bbbdfb6 +refs/heads/master: 1f4d51836f5e49f2e5201f1daf90239c04b3faf2 diff --git a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c index 596d7943024f..074e9baf069a 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c +++ b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c @@ -2677,6 +2677,8 @@ static int ixgbe_add_ethtool_fdir_entry(struct ixgbe_adapter *adapter, /* program filters to filter memory */ err = ixgbe_fdir_write_perfect_filter_82599(hw, &input->filter, input->sw_idx, + (input->action == IXGBE_FDIR_DROP_QUEUE) ? + IXGBE_FDIR_DROP_QUEUE : adapter->rx_ring[input->action]->reg_idx); if (err) goto err_out_w_lock; diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c index 2886daec70ae..916a2b64e5f5 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ixgbe/ixgbe_main.c @@ -3755,9 +3755,11 @@ static void ixgbe_fdir_filter_restore(struct ixgbe_adapter *adapter) hlist_for_each_entry_safe(filter, node, node2, &adapter->fdir_filter_list, fdir_node) { ixgbe_fdir_write_perfect_filter_82599(hw, - &filter->filter, - filter->sw_idx, - filter->action); + &filter->filter, + filter->sw_idx, + (filter->action == IXGBE_FDIR_DROP_QUEUE) ? + IXGBE_FDIR_DROP_QUEUE : + adapter->rx_ring[filter->action]->reg_idx); } spin_unlock(&adapter->fdir_perfect_lock);