Skip to content
Commit 6000df00 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'amd-xgbe'



Tom Lendacky says:

====================
amd-xgbe: AMD XGBE driver fixes 2014-12-02

The following series of patches includes two bug fixes. Unfortunately,
the first patch will create a conflict when eventually merged into
net-next but should be very easy to resolve.

- Do not clear the interrupt bit in the xgbe_ring_data structure
- Associate a Tx SKB with the proper xgbe_ring_data structure

This patch series is based on net.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a5a519b2 c1530317
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment