diff options
author | Jiri Pirko <jpirko@redhat.com> | 2011-12-08 19:52:37 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-08 19:52:37 -0500 |
commit | 8e586137e6b63af1e881b328466ab5ffbe562510 (patch) | |
tree | da0767e1b1361aa24bd32f485453079e31854c0c /include/linux/netdevice.h | |
parent | 7da82c06ded105bf601bfa0eafc92e84eb0ceeed (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 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index eef257c76a40..f7bff9615728 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -792,11 +792,11 @@ struct netdev_tc_txq { | |||
792 | * 3. Update dev->stats asynchronously and atomically, and define | 792 | * 3. Update dev->stats asynchronously and atomically, and define |
793 | * neither operation. | 793 | * neither operation. |
794 | * | 794 | * |
795 | * void (*ndo_vlan_rx_add_vid)(struct net_device *dev, unsigned short vid); | 795 | * int (*ndo_vlan_rx_add_vid)(struct net_device *dev, unsigned short vid); |
796 | * If device support VLAN filtering (dev->features & NETIF_F_HW_VLAN_FILTER) | 796 | * If device support VLAN filtering (dev->features & NETIF_F_HW_VLAN_FILTER) |
797 | * this function is called when a VLAN id is registered. | 797 | * this function is called when a VLAN id is registered. |
798 | * | 798 | * |
799 | * void (*ndo_vlan_rx_kill_vid)(struct net_device *dev, unsigned short vid); | 799 | * int (*ndo_vlan_rx_kill_vid)(struct net_device *dev, unsigned short vid); |
800 | * If device support VLAN filtering (dev->features & NETIF_F_HW_VLAN_FILTER) | 800 | * If device support VLAN filtering (dev->features & NETIF_F_HW_VLAN_FILTER) |
801 | * this function is called when a VLAN id is unregistered. | 801 | * this function is called when a VLAN id is unregistered. |
802 | * | 802 | * |
@@ -911,9 +911,9 @@ struct net_device_ops { | |||
911 | struct rtnl_link_stats64 *storage); | 911 | struct rtnl_link_stats64 *storage); |
912 | struct net_device_stats* (*ndo_get_stats)(struct net_device *dev); | 912 | struct net_device_stats* (*ndo_get_stats)(struct net_device *dev); |
913 | 913 | ||
914 | void (*ndo_vlan_rx_add_vid)(struct net_device *dev, | 914 | int (*ndo_vlan_rx_add_vid)(struct net_device *dev, |
915 | unsigned short vid); | 915 | unsigned short vid); |
916 | void (*ndo_vlan_rx_kill_vid)(struct net_device *dev, | 916 | int (*ndo_vlan_rx_kill_vid)(struct net_device *dev, |
917 | unsigned short vid); | 917 | unsigned short vid); |
918 | #ifdef CONFIG_NET_POLL_CONTROLLER | 918 | #ifdef CONFIG_NET_POLL_CONTROLLER |
919 | void (*ndo_poll_controller)(struct net_device *dev); | 919 | void (*ndo_poll_controller)(struct net_device *dev); |