diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-26 12:21:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-26 12:21:31 -0400 |
| commit | 465c0a165938992455357982d7f15ac105528b4a (patch) | |
| tree | f8bc5541fdac060c36bc283f7e9d33068c668170 /net/unix | |
| parent | 76a0e68129d7d24eb995a6871ab47081bbfa0acc (diff) | |
| parent | 75517d92119a3cd364f618ee962055b3ded8c396 (diff) | |
| download | linux-465c0a165938992455357982d7f15ac105528b4a.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
Jeff Kirsher says:
====================
This series contains updates to ixgbevf and igb.
The ixgbevf calls to pci_disable_msix() and to free the msix_entries
memory should not occur if device open fails. Instead they should be
called during device driver removal to balance with the call to
pci_enable_msix() and the call to allocate msix_entries memory
during the device probe and driver load.
The remaining 4 of 5 igb patches are simple 1-3 line patches to fix
several issues such as possible null pointer dereference, PHC stopping
on max frequency, make sensor info static and SR-IOV initialization
reordering.
The remaining igb patch to fix anti-spoofing config fixes a problem
in i350 where anti spoofing configuration was written into a wrong
register.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix')
0 files changed, 0 insertions, 0 deletions