Commit 3e3fedda authored by Taku Izumi's avatar Taku Izumi Committed by David S. Miller
Browse files

fjes: net_device_ops.ndo_vlan_rx_add/kill_vid 



This patch adds net_device_ops.ndo_vlan_rx_add_vid and
net_device_ops.ndo_vlan_rx_kill_vid callback.

Signed-off-by: default avatarTaku Izumi <izumi.taku@jp.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4393e767

drivers/net/fjes/fjes_hw.c

+27 −0
Original line number Diff line number Diff line
@@ -825,6 +825,33 @@ bool fjes_hw_check_vlan_id(struct epbuf_handler *epbh, u16 vlan_id) 
	return ret;

}



bool fjes_hw_set_vlan_id(struct epbuf_handler *epbh, u16 vlan_id)

{

	union ep_buffer_info *info = epbh->info;

	int i;



	for (i = 0; i < EP_BUFFER_SUPPORT_VLAN_MAX; i++) {

		if (info->v1i.vlan_id[i] == 0) {

			info->v1i.vlan_id[i] = vlan_id;

			return true;

		}

	}

	return false;

}



void fjes_hw_del_vlan_id(struct epbuf_handler *epbh, u16 vlan_id)

{

	union ep_buffer_info *info = epbh->info;

	int i;



	if (0 != vlan_id) {

		for (i = 0; i < EP_BUFFER_SUPPORT_VLAN_MAX; i++) {

			if (vlan_id == info->v1i.vlan_id[i])

				info->v1i.vlan_id[i] = 0;

		}

	}

}



bool fjes_hw_epbuf_rx_is_empty(struct epbuf_handler *epbh)

{

	union ep_buffer_info *info = epbh->info;

drivers/net/fjes/fjes_hw.h

+2 −0
Original line number Diff line number Diff line
@@ -322,6 +322,8 @@ int fjes_hw_epid_is_shared(struct fjes_device_shared_info *, int); 
bool fjes_hw_check_epbuf_version(struct epbuf_handler *, u32);

bool fjes_hw_check_mtu(struct epbuf_handler *, u32);

bool fjes_hw_check_vlan_id(struct epbuf_handler *, u16);

bool fjes_hw_set_vlan_id(struct epbuf_handler *, u16);

void fjes_hw_del_vlan_id(struct epbuf_handler *, u16);

bool fjes_hw_epbuf_rx_is_empty(struct epbuf_handler *);

void *fjes_hw_epbuf_rx_curpkt_get_addr(struct epbuf_handler *, size_t *);

void fjes_hw_epbuf_rx_curpkt_drop(struct epbuf_handler *);

drivers/net/fjes/fjes_main.c

+40 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ static irqreturn_t fjes_intr(int, void*); 
static struct rtnl_link_stats64 *

fjes_get_stats64(struct net_device *, struct rtnl_link_stats64 *);

static int fjes_change_mtu(struct net_device *, int);

static int fjes_vlan_rx_add_vid(struct net_device *, __be16 proto, u16);

static int fjes_vlan_rx_kill_vid(struct net_device *, __be16 proto, u16);

static void fjes_tx_retry(struct net_device *);



static int fjes_acpi_add(struct acpi_device *);
@@ -226,6 +228,8 @@ static const struct net_device_ops fjes_netdev_ops = { 
	.ndo_get_stats64	= fjes_get_stats64,

	.ndo_change_mtu		= fjes_change_mtu,

	.ndo_tx_timeout		= fjes_tx_retry,

	.ndo_vlan_rx_add_vid	= fjes_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid = fjes_vlan_rx_kill_vid,

};



/* fjes_open - Called when a network interface is made active */
@@ -751,6 +755,42 @@ static int fjes_change_mtu(struct net_device *netdev, int new_mtu) 
	return -EINVAL;

}



static int fjes_vlan_rx_add_vid(struct net_device *netdev,

				__be16 proto, u16 vid)

{

	struct fjes_adapter *adapter = netdev_priv(netdev);

	bool ret = true;

	int epid;



	for (epid = 0; epid < adapter->hw.max_epid; epid++) {

		if (epid == adapter->hw.my_epid)

			continue;



		if (!fjes_hw_check_vlan_id(

			&adapter->hw.ep_shm_info[epid].tx, vid))

			ret = fjes_hw_set_vlan_id(

				&adapter->hw.ep_shm_info[epid].tx, vid);

	}



	return ret ? 0 : -ENOSPC;

}



static int fjes_vlan_rx_kill_vid(struct net_device *netdev,

				 __be16 proto, u16 vid)

{

	struct fjes_adapter *adapter = netdev_priv(netdev);

	int epid;



	for (epid = 0; epid < adapter->hw.max_epid; epid++) {

		if (epid == adapter->hw.my_epid)

			continue;



		fjes_hw_del_vlan_id(&adapter->hw.ep_shm_info[epid].tx, vid);

	}



	return 0;

}



static irqreturn_t fjes_intr(int irq, void *data)

{

	struct fjes_adapter *adapter = data;