summaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-07-16 23:04:00 -0700
committerDavid S. Miller <davem@davemloft.net>2012-07-16 23:04:00 -0700
commit7ff65cdea72bdf9af0b9c57cd003211875ca4142 (patch)
tree4efceb55c24f7ba27d322c75956eeef92e6d043b /net/sched
parentac1ae5f33fd225f46da0072e2091962410a0431b (diff)
parentd411a9368bca616b4593e4f3d820dceccdd9027e (diff)
downloadop-kernel-dev-7ff65cdea72bdf9af0b9c57cd003211875ca4142.zip
op-kernel-dev-7ff65cdea72bdf9af0b9c57cd003211875ca4142.tar.gz
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')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud