diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-12 09:14:44 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-12 09:14:44 (GMT) |
| commit | 30129cf28a5c99f9cb7c168f0d280f147fd6cc8b (patch) | |
| tree | 94cdd4f80884e76b5104714c529066d2773fda08 /net/socket.c | |
| parent | e1733de2243609073534cf56afb146a62af3c3d8 (diff) | |
| parent | 1648a23fa159e5c433aac06dc5e0d9db36146016 (diff) | |
| download | linux-30129cf28a5c99f9cb7c168f0d280f147fd6cc8b.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
Ben Hutchings says:
====================
1. Merge sfc changes (only) accepted for 3.9.
2. PTP improvements from Laurence Evans.
3. Overhaul of RX buffer management:
- Always allocate pages, and enable scattering where possible
- Fit as many buffers as will fit into a page, rather than limiting to 2
- Introduce recycle rings to reduce the need for IOMMU mapping and
unmapping
4. PCI error recovery (AER and EEH) implementation.
5. Fix a bug in RX filter replacement.
6. Fix configuration with 1 RX queue in the PF and multiple RX queues in
VFs.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
0 files changed, 0 insertions, 0 deletions