diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-08 12:25:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-08 12:25:03 -0500 |
| commit | 0bcf6aa72b986f9e74d5e6bd717dbf8aef3ea533 (patch) | |
| tree | f8df53a9f6474a5762e2c4b46c4c53fac8d4fa0c /net/ipv6/ndisc.c | |
| parent | c031e234ee304b507b79f76a7677ea0a7a8890e8 (diff) | |
| parent | 3ffcf2cb1e1b68eb48011158a023ee1d0bb4b1fc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
This series contains updates to ixgbevf and e1000e.
Alex's ixgbevf patch is meant to address several race issues that become
possible because next_to_watch could possibly be set to a value that shows
that the descriptor is done when it is not. In order to correct that we
instead make next_to_watch a pointer that is set to NULL during cleanup,
and set to the eop_desc after the descriptor rings have been written.
Stephen's ixgbevf patch makes the PCI id table a const and reformats the
table to match what the ixgbe driver does.
The remaining 13 patches from Bruce are cleanup patches for e1000e to
resolve checkpatch.pl warnings/errors, removing blank lines where
necessary and fix code formatting.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ndisc.c')
0 files changed, 0 insertions, 0 deletions