svn commit: r235423 - in stable/9/sys: dev/bce i386/conf kern

[Pyun YongHyeon]

Author: yongari
Date: Mon May 14 04:21:27 2012
New Revision: 235423
URL: http://svn.freebsd.org/changeset/base/235423

Log:
  MFC r235119:
    Restore jumbo frame configuration which was broken in r218423.
  
    Submitted by:	Andrey Zonov <andrey <> zonov dot org > (initial version)
    Tested by:	Andrey Zonov <andrey <> zonov dot org >

Modified:
  stable/9/sys/dev/bce/if_bce.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)
  stable/9/sys/kern/subr_witness.c   (props changed)

Modified: stable/9/sys/dev/bce/if_bce.c
==============================================================================
--- stable/9/sys/dev/bce/if_bce.c	Mon May 14 03:11:07 2012	(r235422)
+++ stable/9/sys/dev/bce/if_bce.c	Mon May 14 04:21:27 2012	(r235423)
@@ -6842,6 +6842,8 @@ bce_init_locked(struct bce_softc *sc)
 	bcopy(IF_LLADDR(sc->bce_ifp), sc->eaddr, ETHER_ADDR_LEN);
 	bce_set_mac_addr(sc);
 
+	if (bce_hdr_split == FALSE)
+		bce_get_rx_buffer_sizes(sc, ifp->if_mtu);
 	/*
 	 * Calculate and program the hardware Ethernet MTU
  	 * size. Be generous on the receive if we have room
@@ -7436,22 +7438,10 @@ bce_ioctl(struct ifnet *ifp, u_long comm
 
 		BCE_LOCK(sc);
 		ifp->if_mtu = ifr->ifr_mtu;
-
-		if (bce_hdr_split == FALSE) {
-			if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
-				/*
-				 * Because allocation size is used in RX
-				 * buffer allocation, stop controller if
-				 * it is already running.
-				 */
-				bce_stop(sc);
-			}
-
-			bce_get_rx_buffer_sizes(sc, ifp->if_mtu);
-
+		if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
+			ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
 			bce_init_locked(sc);
 		}
-
 		BCE_UNLOCK(sc);
 		break;