Commit d7446c0b authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' into upstream

parents 7d2d8259 187ff3b8

drivers/net/myri10ge/myri10ge.c

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ static int myri10ge_load_firmware(struct myri10ge_priv *mgp) 
		return -ENXIO;

	}

	dev_info(&mgp->pdev->dev, "handoff confirmed\n");

	myri10ge_dummy_rdma(mgp, mgp->tx.boundary != 4096);

	myri10ge_dummy_rdma(mgp, 1);



	return 0;

}

drivers/net/skge.c

+1 −4
Original line number Diff line number Diff line
@@ -516,10 +516,7 @@ static int skge_set_pauseparam(struct net_device *dev, 
/* Chip internal frequency for clock calculations */

static inline u32 hwkhz(const struct skge_hw *hw)

{

	if (hw->chip_id == CHIP_ID_GENESIS)

		return 53215; /* or:  53.125 MHz */

	else

		return 78215; /* or:  78.125 MHz */

	return (hw->chip_id == CHIP_ID_GENESIS) ? 53125 : 78125;

}



/* Chip HZ to microseconds */