ig: Factor out e1000_force_flowctrl

DragonFlyBSD · Nov 25, 2015 · 9b8968b · 9b8968b
1 parent 81ac62f
commit 9b8968b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 34 deletions.
diff --git a/sys/dev/netif/em/if_em.c b/sys/dev/netif/em/if_em.c
@@ -2149,16 +2149,8 @@ em_update_link_status(struct adapter *adapter)
 			    "Full Duplex" : "Half Duplex",
 			    flowctrl);
 		}
-		if (adapter->ifm_flowctrl & IFM_ETH_FORCEPAUSE) {
-			enum e1000_fc_mode fc;
-
-			fc = e1000_ifmedia2fc(adapter->ifm_flowctrl);
-			if (hw->fc.current_mode != fc) {
-				hw->fc.requested_mode = fc;
-				hw->fc.current_mode = fc;
-				e1000_force_mac_fc(hw);
-			}
-		}
+		if (adapter->ifm_flowctrl & IFM_ETH_FORCEPAUSE)
+			e1000_force_flowctrl(hw, adapter->ifm_flowctrl);
 		adapter->link_active = 1;
 		adapter->smartspeed = 0;
 		ifp->if_baudrate = adapter->link_speed * 1000000;

diff --git a/sys/dev/netif/emx/if_emx.c b/sys/dev/netif/emx/if_emx.c
@@ -1883,16 +1883,8 @@ emx_update_link_status(struct emx_softc *sc)
 			    "Full Duplex" : "Half Duplex",
 			    flowctrl);
 		}
-		if (sc->ifm_flowctrl & IFM_ETH_FORCEPAUSE) {
-			enum e1000_fc_mode fc;
-
-			fc = e1000_ifmedia2fc(sc->ifm_flowctrl);
-			if (hw->fc.current_mode != fc) {
-				hw->fc.requested_mode = fc;
-				hw->fc.current_mode = fc;
-				e1000_force_mac_fc(hw);
-			}
-		}
+		if (sc->ifm_flowctrl & IFM_ETH_FORCEPAUSE)
+			e1000_force_flowctrl(hw, sc->ifm_flowctrl);
 		sc->link_active = 1;
 		sc->smartspeed = 0;
 		ifp->if_baudrate = sc->link_speed * 1000000;

diff --git a/sys/dev/netif/ig_hal/e1000_dragonfly.h b/sys/dev/netif/ig_hal/e1000_dragonfly.h
@@ -35,12 +35,9 @@
 #ifndef _E1000_DRAGONFLY_H_
 #define _E1000_DRAGONFLY_H_
 
-struct ifnet;
-struct sysctl_oid;
-struct sysctl_req;
-
 void	e1000_fc2str(enum e1000_fc_mode fc, char *str, int len);
 enum e1000_fc_mode e1000_ifmedia2fc(int ifm);
 int	e1000_fc2ifmedia(enum e1000_fc_mode fc);
+void	e1000_force_flowctrl(struct e1000_hw *hw, int ifm);
 
 #endif	/* !_E1000_DRAGONFLY_H_ */
diff --git a/sys/dev/netif/ig_hal/e1000_osdep.c b/sys/dev/netif/ig_hal/e1000_osdep.c
@@ -164,6 +164,19 @@ e1000_fc2ifmedia(enum e1000_fc_mode fc)
 	}
 }
 
+void
+e1000_force_flowctrl(struct e1000_hw *hw, int ifm)
+{
+	enum e1000_fc_mode fc;
+
+	fc = e1000_ifmedia2fc(ifm);
+	if (hw->fc.current_mode != fc) {
+		hw->fc.requested_mode = fc;
+		hw->fc.current_mode = fc;
+		e1000_force_mac_fc(hw);
+	}
+}
+
 /* Module glue */
 static moduledata_t ig_hal_mod = { "ig_hal" };
 DECLARE_MODULE(ig_hal, ig_hal_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE);

diff --git a/sys/dev/netif/igb/if_igb.c b/sys/dev/netif/igb/if_igb.c
@@ -1332,16 +1332,8 @@ igb_update_link_status(struct igb_softc *sc)
 			    "Full Duplex" : "Half Duplex",
 			    flowctrl);
 		}
-		if (sc->ifm_flowctrl & IFM_ETH_FORCEPAUSE) {
-			enum e1000_fc_mode fc;
-
-			fc = e1000_ifmedia2fc(sc->ifm_flowctrl);
-			if (hw->fc.current_mode != fc) {
-				hw->fc.requested_mode = fc;
-				hw->fc.current_mode = fc;
-				e1000_force_mac_fc(hw);
-			}
-		}
+		if (sc->ifm_flowctrl & IFM_ETH_FORCEPAUSE)
+			e1000_force_flowctrl(hw, sc->ifm_flowctrl);
 		sc->link_active = 1;
 
 		ifp->if_baudrate = sc->link_speed * 1000000;