diff options
| author | Michael Chan | 2017-01-13 07:32:01 +0100 |
|---|---|---|
| committer | David S. Miller | 2017-01-14 05:21:31 +0100 |
| commit | 341138c3e6afa8e77f9f3e773d72b37022dbcee8 (patch) | |
| tree | ff622af7649a1c5b4546762e3784b2d29bab2d71 /drivers/net/ethernet/broadcom/bnxt/bnxt.c | |
| parent | bnxt_en: Fix compiler warnings when CONFIG_RFS_ACCEL is not defined. (diff) | |
| download | kernel-qcow2-linux-341138c3e6afa8e77f9f3e773d72b37022dbcee8.tar.gz kernel-qcow2-linux-341138c3e6afa8e77f9f3e773d72b37022dbcee8.tar.xz kernel-qcow2-linux-341138c3e6afa8e77f9f3e773d72b37022dbcee8.zip | |
bnxt_en: Clear TPA flags when BNXT_FLAG_NO_AGG_RINGS is set.
Commit bdbd1eb59c56 ("bnxt_en: Handle no aggregation ring gracefully.")
introduced the BNXT_FLAG_NO_AGG_RINGS flag. For consistency,
bnxt_set_tpa_flags() should also clear TPA flags when there are no
aggregation rings.
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnxt/bnxt.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index c0918507fdb4..df2358bb05e1 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -2467,6 +2467,8 @@ static int bnxt_calc_nr_ring_pages(u32 ring_size, int desc_per_pg) static void bnxt_set_tpa_flags(struct bnxt *bp) { bp->flags &= ~BNXT_FLAG_TPA; + if (bp->flags & BNXT_FLAG_NO_AGG_RINGS) + return; if (bp->dev->features & NETIF_F_LRO) bp->flags |= BNXT_FLAG_LRO; if (bp->dev->features & NETIF_F_GRO) |