diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-17 08:04:00 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-17 08:04:00 +0200 |
| commit | 7ff65cdea72bdf9af0b9c57cd003211875ca4142 (patch) | |
| tree | 4efceb55c24f7ba27d322c75956eeef92e6d043b /net/sched/sch_netem.c | |
| parent | be2net: dont pull too much data in skb linear part (diff) | |
| parent | ixgbe: Merge FCoE set_num and cache_ring calls into RSS/DCB config (diff) | |
| download | linux-7ff65cdea72bdf9af0b9c57cd003211875ca4142.tar.xz linux-7ff65cdea72bdf9af0b9c57cd003211875ca4142.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jett Kirsher says:
====================
This series contains updates to e1000e and ixgbe.
...
Alexander Duyck (5):
ixgbe: Simplify logic for getting traffic class from user priority
ixgbe: Cleanup unpacking code for DCB
ixgbe: Populate the prio_tc_map in ixgbe_setup_tc
ixgbe: Add function for obtaining FCoE TC based on FCoE user priority
ixgbe: Merge FCoE set_num and cache_ring calls into RSS/DCB config
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_netem.c')
0 files changed, 0 insertions, 0 deletions