summaryrefslogtreecommitdiffstats
path: root/net/ipv6/ndisc.c
diff options
context:
space:
mode:
authorNeil Horman2013-07-16 16:49:41 +0200
committerDavid S. Miller2013-07-16 21:09:02 +0200
commit584ec4355355ffac43571b02a314d43eb2f7fcbf (patch)
tree9e58e5abe3b36222e1c730fb9083c91784e9e0fd /net/ipv6/ndisc.c
parentMerge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/t... (diff)
downloadkernel-qcow2-linux-584ec4355355ffac43571b02a314d43eb2f7fcbf.tar.gz
kernel-qcow2-linux-584ec4355355ffac43571b02a314d43eb2f7fcbf.tar.xz
kernel-qcow2-linux-584ec4355355ffac43571b02a314d43eb2f7fcbf.zip
atl1e: unmap partially mapped skb on dma error and free skb
Ben Hutchings pointed out that my recent update to atl1e in commit 352900b583b2852152a1e05ea0e8b579292e731e ("atl1e: fix dma mapping warnings") was missing a bit of code. Specifically it reset the hardware tx ring to its origional state when we hit a dma error, but didn't unmap any exiting mappings from the operation. This patch fixes that up. It also remembers to free the skb in the event that an error occurs, so we don't leak. Untested, as I don't have hardware. I think its pretty straightforward, but please review closely. Signed-off-by: Neil Horman <nhorman@tuxdriver.com> CC: Ben Hutchings <bhutchings@solarflare.com> CC: Jay Cliburn <jcliburn@gmail.com> CC: Chris Snook <chris.snook@gmail.com> CC: "David S. Miller" <davem@davemloft.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ndisc.c')
0 files changed, 0 insertions, 0 deletions