mirror of
https://github.com/adulau/aha.git
synced 2024-12-29 04:06:22 +00:00
ixgb: remove skb->dev assignment
Same change as e1000: remove skb->dev assignment, it's now done by netdev_alloc_skb. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
This commit is contained in:
parent
01748fbb41
commit
69c7a94033
1 changed files with 4 additions and 7 deletions
|
@ -1974,7 +1974,6 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)
|
|||
netdev_alloc_skb(netdev, length + NET_IP_ALIGN);
|
||||
if (new_skb) {
|
||||
skb_reserve(new_skb, NET_IP_ALIGN);
|
||||
new_skb->dev = netdev;
|
||||
memcpy(new_skb->data - NET_IP_ALIGN,
|
||||
skb->data - NET_IP_ALIGN,
|
||||
length + NET_IP_ALIGN);
|
||||
|
@ -2054,14 +2053,14 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter)
|
|||
/* leave three descriptors unused */
|
||||
while(--cleancount > 2) {
|
||||
/* recycle! its good for you */
|
||||
if (!(skb = buffer_info->skb))
|
||||
skb = netdev_alloc_skb(netdev, adapter->rx_buffer_len
|
||||
+ NET_IP_ALIGN);
|
||||
else {
|
||||
skb = buffer_info->skb;
|
||||
if (skb) {
|
||||
skb_trim(skb, 0);
|
||||
goto map_skb;
|
||||
}
|
||||
|
||||
skb = netdev_alloc_skb(netdev, adapter->rx_buffer_len
|
||||
+ NET_IP_ALIGN);
|
||||
if (unlikely(!skb)) {
|
||||
/* Better luck next round */
|
||||
adapter->alloc_rx_buff_failed++;
|
||||
|
@ -2074,8 +2073,6 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter)
|
|||
*/
|
||||
skb_reserve(skb, NET_IP_ALIGN);
|
||||
|
||||
skb->dev = netdev;
|
||||
|
||||
buffer_info->skb = skb;
|
||||
buffer_info->length = adapter->rx_buffer_len;
|
||||
map_skb:
|
||||
|
|
Loading…
Reference in a new issue