Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...

[GitHub/LineageOS/android_kernel_samsung_universal7580.git] / include / linux / if.h

diff --git a/include/linux/if.h b/include/linux/if.h
index 3a9f410a296b35291150d27e900fb73d27d0c3d6..be350e62a905438533b0231439d8d65fd53d7de4 100644 (file)
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -71,6 +71,8 @@
                                         * release skb->dst
                                         */
 #define IFF_DONT_BRIDGE 0x800          /* disallow bridging this ether dev */
+#define IFF_IN_NETPOLL 0x1000          /* whether we are processing netpoll */
+#define IFF_DISABLE_NETPOLL    0x2000  /* disable netpoll at run-time */
 
 #define IF_GET_IFACE   0x0001          /* for querying only */
 #define IF_GET_PROTO   0x0002