Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eca3fd83 authored by Brice Goglin's avatar Brice Goglin Committed by Jeff Garzik
Browse files

myri10ge: fix potential infinite loop in enable_ecrc 



Fix another potential for an infinite loop while looking for the
root port in myri10ge_enable_ecrc().

Signed-off-by: default avatarBrice Goglin <brice@myri.com>
Signed-off-by: default avatarAndrew Gallatin <gallatin@myri.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 99f5f87e

drivers/net/myri10ge/myri10ge.c

+3 −2
Original line number Diff line number Diff line
@@ -2657,13 +2657,14 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp) 
	ext_type = (val & PCI_EXP_FLAGS_TYPE) >> 4;

	if (ext_type != PCI_EXP_TYPE_ROOT_PORT) {

		if (myri10ge_ecrc_enable > 1) {

			struct pci_dev *old_bridge = bridge;

			struct pci_dev *prev_bridge, *old_bridge = bridge;



			/* Walk the hierarchy up to the root port

			 * where ECRC has to be enabled */

			do {

				prev_bridge = bridge;

				bridge = bridge->bus->self;

				if (!bridge) {

				if (!bridge || prev_bridge == bridge) {

					dev_err(dev,

						"Failed to find root port"

						" to force ECRC\n");