diff --git a/[refs] b/[refs] index 69cec131f913..264bfcbc03f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64bb336c8f4de8b281d0d44f2ec2c900b9b28466 +refs/heads/master: b3003be36a3c9215cd17182349981581de269048 diff --git a/trunk/drivers/net/cxgb4vf/sge.c b/trunk/drivers/net/cxgb4vf/sge.c index 5c4a81dae19a..3a7c02f98a4d 100644 --- a/trunk/drivers/net/cxgb4vf/sge.c +++ b/trunk/drivers/net/cxgb4vf/sge.c @@ -2432,7 +2432,7 @@ int t4vf_sge_init(struct adapter *adapter) STAT_LEN = ((sge_params->sge_control & EGRSTATUSPAGESIZE) ? 128 : 64); PKTSHIFT = PKTSHIFT_GET(sge_params->sge_control); FL_ALIGN = 1 << (INGPADBOUNDARY_GET(sge_params->sge_control) + - INGPADBOUNDARY_SHIFT); + SGE_INGPADBOUNDARY_SHIFT); /* * Set up tasklet timers.