Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux-2.6-microblaze.git] / include / linux / netdevice.h

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 88d40b9..b0e303f 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1749,6 +1749,8 @@ enum netdev_priv_flags {
  *     @real_num_rx_queues:    Number of RX queues currently active in device
  *     @xdp_prog:              XDP sockets filter program pointer
  *     @gro_flush_timeout:     timeout for GRO layer in NAPI
+ *     @napi_defer_hard_irqs:  If not zero, provides a counter that would
+ *                             allow to avoid NIC hard IRQ, on busy queues.
  *
  *     @rx_handler:            handler for received packets
  *     @rx_handler_data:       XXX: need comments on this one
@@ -4840,6 +4842,11 @@ static inline bool netif_is_ovs_port(const struct net_device *dev)
        return dev->priv_flags & IFF_OVS_DATAPATH;
 }
 
+static inline bool netif_is_any_bridge_port(const struct net_device *dev)
+{
+       return netif_is_bridge_port(dev) || netif_is_ovs_port(dev);
+}
+
 static inline bool netif_is_team_master(const struct net_device *dev)
 {
        return dev->priv_flags & IFF_TEAM;