diff --git a/[refs] b/[refs] index c80de9941a78..aa9e783c35ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e7a22e3eb49042c048f24bab40cf5cf8915487d +refs/heads/master: f6d9a2565bc754043f43b8f51b19f77ee0269411 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 97e27d8e5528..07795449709f 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -9404,7 +9404,7 @@ static int tg3_nvram_write_block_buffered(struct tg3 *tp, u32 offset, u32 len, if ((page_off == 0) || (i == 0)) nvram_cmd |= NVRAM_CMD_FIRST; - else if (page_off == (tp->nvram_pagesize - 4)) + if (page_off == (tp->nvram_pagesize - 4)) nvram_cmd |= NVRAM_CMD_LAST; if (i == (len - 4))