aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/neterion
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2011-12-08 19:52:37 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-08 19:52:37 -0500
commit8e586137e6b63af1e881b328466ab5ffbe562510 (patch)
treeda0767e1b1361aa24bd32f485453079e31854c0c /drivers/net/ethernet/neterion
parent7da82c06ded105bf601bfa0eafc92e84eb0ceeed (diff)
net: make vlan ndo_vlan_rx_[add/kill]_vid return error value
Let caller know the result of adding/removing vlan id to/from vlan filter. In some drivers I make those functions to just return 0. But in those where there is able to see if hw setup went correctly, return value is set appropriately. Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/neterion')
-rw-r--r--drivers/net/ethernet/neterion/vxge/vxge-main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index 16d4d8e913c3..ef76725454d2 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -3305,7 +3305,7 @@ static void vxge_tx_watchdog(struct net_device *dev)
3305 * 3305 *
3306 * Add the vlan id to the devices vlan id table 3306 * Add the vlan id to the devices vlan id table
3307 */ 3307 */
3308static void 3308static int
3309vxge_vlan_rx_add_vid(struct net_device *dev, unsigned short vid) 3309vxge_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
3310{ 3310{
3311 struct vxgedev *vdev = netdev_priv(dev); 3311 struct vxgedev *vdev = netdev_priv(dev);
@@ -3320,6 +3320,7 @@ vxge_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
3320 vxge_hw_vpath_vid_add(vpath->handle, vid); 3320 vxge_hw_vpath_vid_add(vpath->handle, vid);
3321 } 3321 }
3322 set_bit(vid, vdev->active_vlans); 3322 set_bit(vid, vdev->active_vlans);
3323 return 0;
3323} 3324}
3324 3325
3325/** 3326/**
@@ -3329,7 +3330,7 @@ vxge_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
3329 * 3330 *
3330 * Remove the vlan id from the device's vlan id table 3331 * Remove the vlan id from the device's vlan id table
3331 */ 3332 */
3332static void 3333static int
3333vxge_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) 3334vxge_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
3334{ 3335{
3335 struct vxgedev *vdev = netdev_priv(dev); 3336 struct vxgedev *vdev = netdev_priv(dev);
@@ -3348,6 +3349,7 @@ vxge_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
3348 vxge_debug_entryexit(VXGE_TRACE, 3349 vxge_debug_entryexit(VXGE_TRACE,
3349 "%s:%d Exiting...", __func__, __LINE__); 3350 "%s:%d Exiting...", __func__, __LINE__);
3350 clear_bit(vid, vdev->active_vlans); 3351 clear_bit(vid, vdev->active_vlans);
3352 return 0;
3351} 3353}
3352 3354
3353static const struct net_device_ops vxge_netdev_ops = { 3355static const struct net_device_ops vxge_netdev_ops = {