Commit 81dc0741 authored by Mengyuan Lou's avatar Mengyuan Lou Committed by David S. Miller
Browse files

net: wangxun: Implement the ndo change mtu interface 



Add ngbe and txgbe ndo_change_mtu support.

Signed-off-by: default avatarMengyuan Lou <mengyuanlou@net-swift.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c36a77c3

drivers/net/ethernet/wangxun/libwx/wx_hw.c

+20 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/etherdevice.h>

#include <linux/netdevice.h>

#include <linux/if_ether.h>

#include <linux/if_vlan.h>

#include <linux/iopoll.h>

#include <linux/pci.h>
@@ -1261,7 +1262,7 @@ static void wx_set_rx_buffer_len(struct wx *wx) 
	struct net_device *netdev = wx->netdev;

	u32 mhadd, max_frame;



	max_frame = netdev->mtu + ETH_HLEN + ETH_FCS_LEN;

	max_frame = netdev->mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;

	/* adjust max frame to be at least the size of a standard frame */

	if (max_frame < (ETH_FRAME_LEN + ETH_FCS_LEN))

		max_frame = (ETH_FRAME_LEN + ETH_FCS_LEN);
@@ -1271,6 +1272,24 @@ static void wx_set_rx_buffer_len(struct wx *wx) 
		wr32(wx, WX_PSR_MAX_SZ, max_frame);

}



/**

 * wx_change_mtu - Change the Maximum Transfer Unit

 * @netdev: network interface device structure

 * @new_mtu: new value for maximum frame size

 *

 * Returns 0 on success, negative on failure

 **/

int wx_change_mtu(struct net_device *netdev, int new_mtu)

{

	struct wx *wx = netdev_priv(netdev);



	netdev->mtu = new_mtu;

	wx_set_rx_buffer_len(wx);



	return 0;

}

EXPORT_SYMBOL(wx_change_mtu);



/* Disable the specified rx queue */

void wx_disable_rx_queue(struct wx *wx, struct wx_ring *ring)

{

drivers/net/ethernet/wangxun/libwx/wx_hw.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ void wx_flush_sw_mac_table(struct wx *wx); 
int wx_set_mac(struct net_device *netdev, void *p);

void wx_disable_rx(struct wx *wx);

void wx_set_rx_mode(struct net_device *netdev);

int wx_change_mtu(struct net_device *netdev, int new_mtu);

void wx_disable_rx_queue(struct wx *wx, struct wx_ring *ring);

void wx_configure(struct wx *wx);

int wx_disable_pcie_master(struct wx *wx);

drivers/net/ethernet/wangxun/libwx/wx_type.h

+2 −0
Original line number Diff line number Diff line
@@ -300,6 +300,8 @@ 
#define WX_MAX_RXD                   8192

#define WX_MAX_TXD                   8192



#define WX_MAX_JUMBO_FRAME_SIZE      9432 /* max payload 9414 */



/* Supported Rx Buffer Sizes */

#define WX_RXBUFFER_256      256    /* Used for skb receive header */

#define WX_RXBUFFER_2K       2048

drivers/net/ethernet/wangxun/ngbe/ngbe_main.c

+4 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/etherdevice.h>

#include <net/ip.h>

#include <linux/phy.h>

#include <linux/if_vlan.h>



#include "../libwx/wx_type.h"

#include "../libwx/wx_hw.h"
@@ -469,6 +470,7 @@ static void ngbe_shutdown(struct pci_dev *pdev) 
static const struct net_device_ops ngbe_netdev_ops = {

	.ndo_open               = ngbe_open,

	.ndo_stop               = ngbe_close,

	.ndo_change_mtu         = wx_change_mtu,

	.ndo_start_xmit         = wx_xmit_frame,

	.ndo_set_rx_mode        = wx_set_rx_mode,

	.ndo_validate_addr      = eth_validate_addr,
@@ -560,7 +562,8 @@ static int ngbe_probe(struct pci_dev *pdev, 
	netdev->priv_flags |= IFF_SUPP_NOFCS;



	netdev->min_mtu = ETH_MIN_MTU;

	netdev->max_mtu = NGBE_MAX_JUMBO_FRAME_SIZE - (ETH_HLEN + ETH_FCS_LEN);

	netdev->max_mtu = WX_MAX_JUMBO_FRAME_SIZE -

			  (ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN);



	wx->bd_number = func_nums;

	/* setup the private structure */

drivers/net/ethernet/wangxun/ngbe/ngbe_type.h

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ enum NGBE_MSCA_CMD_value { 
#define NGBE_RX_PB_SIZE				42

#define NGBE_MC_TBL_SIZE			128

#define NGBE_TDB_PB_SZ				(20 * 1024) /* 160KB Packet Buffer */

#define NGBE_MAX_JUMBO_FRAME_SIZE		9432 /* max payload 9414 */



/* TX/RX descriptor defines */

#define NGBE_DEFAULT_TXD			512 /* default ring size */