Merge branch 'oom_fixes'
authorDavid S. Miller <davem@davemloft.net>
Mon, 8 Sep 2014 23:02:59 +0000 (16:02 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 8 Sep 2014 23:02:59 +0000 (16:02 -0700)
commit4748997ec7572bd86dddbe36ed056aff9f3a7c1d
tree28483cec84c56b551a51d19a25d5479ea948aae5
parent278d436a476f69fc95d5c82bf61b6c2d02f4d44e
parentb629be5c8399d7c423b92135eb43a86c924d1cbc
Merge branch 'oom_fixes'

Florian Fainelli says:

====================
net: systemport and bcmgenet OOM fixes

These two patches fix similar Out of Memory code paths in the SYSTEMPORT and
GENET drivers. Under high memory pressure, we could produce an OOPS by
passing a NULL pointer to dma_unmap_single().
====================

Signed-off-by: David S. Miller <davem@davemloft.net>