svn commit: r214299 - stable/8/sys/dev/usb/net

[Pyun YongHyeon]

Author: yongari
Date: Sun Oct 24 21:25:15 2010
New Revision: 214299
URL: http://svn.freebsd.org/changeset/base/214299

Log:
  MFC r213436:
    Don't count input error twice. uether_rxbuf() already updated that
    counter.

Modified:
  stable/8/sys/dev/usb/net/if_axe.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/usb/net/if_axe.c
==============================================================================
--- stable/8/sys/dev/usb/net/if_axe.c	Sun Oct 24 21:23:27 2010	(r214298)
+++ stable/8/sys/dev/usb/net/if_axe.c	Sun Oct 24 21:25:15 2010	(r214299)
@@ -813,13 +813,12 @@ axe_bulk_read_callback(struct usb_xfer *
 					err = EINVAL;
 					break;
 				}
-				err = uether_rxbuf(ue, pc, pos, len);
+				uether_rxbuf(ue, pc, pos, len);
 
 				pos += len + (len % 2);
 			}
-		} else {
-			err = uether_rxbuf(ue, pc, 0, actlen);
-		}
+		} else
+			uether_rxbuf(ue, pc, 0, actlen);
 
 		if (err != 0)
 			ifp->if_ierrors++;