Index: sys/dev/e1000/if_em.c
===================================================================
--- sys/dev/e1000/if_em.c	(revision 313864)
+++ sys/dev/e1000/if_em.c	(working copy)
@@ -2236,6 +2236,25 @@
 	case e1000_pch_spt:
 		pba = E1000_PBA_26K;
 		break;
+	case e1000_82575:
+  		pba = E1000_PBA_32K;
+		break;
+	case e1000_82576:
+	case e1000_vfadapt:
+		pba = E1000_READ_REG(hw, E1000_RXPBS);
+		pba &= E1000_RXPBS_SIZE_MASK_82576;
+		break;
+	case e1000_82580:
+	case e1000_i350:
+	case e1000_i354:
+	case e1000_vfadapt_i350:
+		pba = E1000_READ_REG(hw, E1000_RXPBS);
+		pba = e1000_rxpbs_adjust_82580(pba);
+		break;
+	case e1000_i210:
+	case e1000_i211:
+		pba = E1000_PBA_34K;
+		break;
 	default:
 		if (adapter->hw.mac.max_frame_size > 8192)
 			pba = E1000_PBA_40K; /* 40K for Rx, 24K for Tx */
@@ -2242,7 +2261,11 @@
 		else
 			pba = E1000_PBA_48K; /* 48K for Rx, 16K for Tx */
 	}
-	E1000_WRITE_REG(&adapter->hw, E1000_PBA, pba);
+	if(hw->mac.type<igb_mac_min) {
+	  E1000_WRITE_REG(&adapter->hw, E1000_PBA, pba);
+	}
+	
+	INIT_DEBUGOUT1("em_reset: pba=%dK",pba);
 
 	/*
 	 * These parameters control the automatic generation (Tx) and
@@ -2258,7 +2281,7 @@
 	 *   by 1500.
 	 * - The pause time is fairly large at 1000 x 512ns = 512 usec.
 	 */
-	rx_buffer_size = ((E1000_READ_REG(hw, E1000_PBA) & 0xffff) << 10 );
+	rx_buffer_size = (pba & 0xffff) << 10;
 	hw->fc.high_water = rx_buffer_size -
 	    roundup2(adapter->hw.mac.max_frame_size, 1024);
 	hw->fc.low_water = hw->fc.high_water - 1500;
@@ -2303,6 +2326,21 @@
 		else
 			E1000_WRITE_REG(hw, E1000_PBA, 26);
 		break;
+	case e1000_82575:
+	case e1000_82576:
+		/* 8-byte granularity */
+		hw->fc.low_water = hw->fc.high_water - 8;
+		break;
+	case e1000_82580:
+	case e1000_i350:
+	case e1000_i354:
+	case e1000_i210:
+	case e1000_i211:
+	case e1000_vfadapt:
+	case e1000_vfadapt_i350:
+		/* 16-byte granularity */
+		hw->fc.low_water = hw->fc.high_water - 16;
+		break; 
         case e1000_ich9lan:
         case e1000_ich10lan:
 		if (if_getmtu(ifp) > ETHERMTU) {