xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ixgbevf: Add fix to VF to handle multi-descriptor buffers

Browse Source 
This change fixes the ixgbevf driver so that it can correctly drop a frame
should it receive a jumbo frame.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Alexander Duyck
2012-09-01 05:12:38 +00:00
committed by Jeff Kirsher
parent ac6ed8f00a
commit 5c60f81a25
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h
View File

@@ -261,6 +261,11 @@ enum ixbgevf_state_t {
__IXGBEVF_DOWN __IXGBEVF_DOWN
}; };
struct ixgbevf_cb {
struct sk_buff *prev;
};
#define IXGBE_CB(skb) ((struct ixgbevf_cb *)(skb)->cb)
enum ixgbevf_boards { enum ixgbevf_boards {
board_82599_vf, board_82599_vf,
board_X540_vf, board_X540_vf,

14
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
View File

@@ -433,11 +433,21 @@ static bool ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector,
if (!(staterr & IXGBE_RXD_STAT_EOP)) { if (!(staterr & IXGBE_RXD_STAT_EOP)) {
skb->next = next_buffer->skb; skb->next = next_buffer->skb;
skb->next->prev = skb; IXGBE_CB(skb->next)->prev = skb;
adapter->non_eop_descs++; adapter->non_eop_descs++;
goto next_desc; goto next_desc;
} }
/* we should not be chaining buffers, if we did drop the skb */
if (IXGBE_CB(skb)->prev) {
do {
struct sk_buff *this = skb;
skb = IXGBE_CB(skb)->prev;
dev_kfree_skb(this);
} while (skb);
goto next_desc;
}
/* ERR_MASK will only have valid bits if EOP set */ /* ERR_MASK will only have valid bits if EOP set */
if (unlikely(staterr & IXGBE_RXDADV_ERR_FRAME_ERR_MASK)) { if (unlikely(staterr & IXGBE_RXDADV_ERR_FRAME_ERR_MASK)) {
dev_kfree_skb_irq(skb); dev_kfree_skb_irq(skb);
@@ -1439,7 +1449,7 @@ static void ixgbevf_clean_rx_ring(struct ixgbevf_adapter *adapter,
rx_buffer_info->skb = NULL; rx_buffer_info->skb = NULL;
do { do {
struct sk_buff *this = skb; struct sk_buff *this = skb;
skb = skb->prev; skb = IXGBE_CB(skb)->prev;
dev_kfree_skb(this); dev_kfree_skb(this);
} while (skb); } while (skb);
} }