提交 69c7a940 编写于 作者: A Auke Kok 提交者: Auke Kok

ixgb: remove skb->dev assignment

Same change as e1000: remove skb->dev assignment, it's now done
by netdev_alloc_skb.
Signed-off-by: NAuke Kok <auke-jan.h.kok@intel.com>
上级 01748fbb
...@@ -1974,7 +1974,6 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter) ...@@ -1974,7 +1974,6 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)
netdev_alloc_skb(netdev, length + NET_IP_ALIGN); netdev_alloc_skb(netdev, length + NET_IP_ALIGN);
if (new_skb) { if (new_skb) {
skb_reserve(new_skb, NET_IP_ALIGN); skb_reserve(new_skb, NET_IP_ALIGN);
new_skb->dev = netdev;
memcpy(new_skb->data - NET_IP_ALIGN, memcpy(new_skb->data - NET_IP_ALIGN,
skb->data - NET_IP_ALIGN, skb->data - NET_IP_ALIGN,
length + NET_IP_ALIGN); length + NET_IP_ALIGN);
...@@ -2054,14 +2053,14 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter) ...@@ -2054,14 +2053,14 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter)
/* leave three descriptors unused */ /* leave three descriptors unused */
while(--cleancount > 2) { while(--cleancount > 2) {
/* recycle! its good for you */ /* recycle! its good for you */
if (!(skb = buffer_info->skb)) skb = buffer_info->skb;
skb = netdev_alloc_skb(netdev, adapter->rx_buffer_len if (skb) {
+ NET_IP_ALIGN);
else {
skb_trim(skb, 0); skb_trim(skb, 0);
goto map_skb; goto map_skb;
} }
skb = netdev_alloc_skb(netdev, adapter->rx_buffer_len
+ NET_IP_ALIGN);
if (unlikely(!skb)) { if (unlikely(!skb)) {
/* Better luck next round */ /* Better luck next round */
adapter->alloc_rx_buff_failed++; adapter->alloc_rx_buff_failed++;
...@@ -2074,8 +2073,6 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter) ...@@ -2074,8 +2073,6 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter)
*/ */
skb_reserve(skb, NET_IP_ALIGN); skb_reserve(skb, NET_IP_ALIGN);
skb->dev = netdev;
buffer_info->skb = skb; buffer_info->skb = skb;
buffer_info->length = adapter->rx_buffer_len; buffer_info->length = adapter->rx_buffer_len;
map_skb: map_skb:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册