atl1e: unmap partially mapped skb on dma error and free skb
authorNeil Horman <nhorman@tuxdriver.com>
Tue, 16 Jul 2013 14:49:41 +0000 (10:49 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 16 Jul 2013 19:09:02 +0000 (12:09 -0700)
commit584ec4355355ffac43571b02a314d43eb2f7fcbf
tree9e58e5abe3b36222e1c730fb9083c91784e9e0fd
parent47188d39b5deeebf41f87a02af1b3935866364cf
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>
drivers/net/ethernet/atheros/atl1e/atl1e_main.c