aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Kicinski <jakub.kicinski@netronome.com>2016-04-07 14:39:34 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-08 15:26:03 -0400
commitff1b68ab2daf292c0f0897f9c155a6ddc8484693 (patch)
treec611fdd9b24d80e20951b2b495782fb8e9548c84
parent70f767d3afa9b2cd447b3dfc33c2751833dce931 (diff)
nfp: correct RX buffer length calculation
When calculating the RX buffer length we need to account for up to 2 VLAN tags. Rounding up to 1k is an relic of a distant past and can be removed. While at it also remove trivial print statement. Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/netronome/nfp/nfp_net_common.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index 43c618bafdb6..0dae81454e77 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -1911,9 +1911,6 @@ static void nfp_net_set_rx_mode(struct net_device *netdev)
1911static int nfp_net_change_mtu(struct net_device *netdev, int new_mtu) 1911static int nfp_net_change_mtu(struct net_device *netdev, int new_mtu)
1912{ 1912{
1913 struct nfp_net *nn = netdev_priv(netdev); 1913 struct nfp_net *nn = netdev_priv(netdev);
1914 u32 tmp;
1915
1916 nn_dbg(nn, "New MTU = %d\n", new_mtu);
1917 1914
1918 if (new_mtu < 68 || new_mtu > nn->max_mtu) { 1915 if (new_mtu < 68 || new_mtu > nn->max_mtu) {
1919 nn_err(nn, "New MTU (%d) is not valid\n", new_mtu); 1916 nn_err(nn, "New MTU (%d) is not valid\n", new_mtu);
@@ -1921,10 +1918,7 @@ static int nfp_net_change_mtu(struct net_device *netdev, int new_mtu)
1921 } 1918 }
1922 1919
1923 netdev->mtu = new_mtu; 1920 netdev->mtu = new_mtu;
1924 1921 nn->fl_bufsz = NFP_NET_MAX_PREPEND + ETH_HLEN + VLAN_HLEN * 2 + new_mtu;
1925 /* Freelist buffer size rounded up to the nearest 1K */
1926 tmp = new_mtu + ETH_HLEN + VLAN_HLEN + NFP_NET_MAX_PREPEND;
1927 nn->fl_bufsz = roundup(tmp, 1024);
1928 1922
1929 /* restart if running */ 1923 /* restart if running */
1930 if (netif_running(netdev)) { 1924 if (netif_running(netdev)) {