2 files changed, 4 insertions, 2 deletions

diff --git a/Documentation/networking/netdevices.txt b/Documentation/networking/netdevices.txt
index 9f7be9b7785e..d0f71fc7f782 100644
--- a/Documentation/networking/netdevices.txt
+++ b/Documentation/networking/netdevices.txt
@@ -73,7 +73,8 @@ dev->hard_start_xmit:
         has to lock by itself when needed. It is recommended to use a try lock
         for this and return NETDEV_TX_LOCKED when the spin lock fails.
         The locking there should also properly protect against 
-        set_multicast_list.
+        set_multicast_list. Note that the use of NETIF_F_LLTX is deprecated.
+        Dont use it for new drivers.
 
         Context: Process with BHs disabled or BH (timer),
                  will be called with interrupts disabled by netconsole.
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index baa915f0d285..2088097663b5 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -449,7 +449,8 @@ struct net_device
 #define NETIF_F_HW_VLAN_FILTER  512     /* Receive filtering on VLAN */
 #define NETIF_F_VLAN_CHALLENGED 1024    /* Device cannot handle VLAN packets */
 #define NETIF_F_GSO             2048    /* Enable software GSO. */
-#define NETIF_F_LLTX            4096    /* LockLess TX */
+#define NETIF_F_LLTX            4096    /* LockLess TX - deprecated. Please */
+                                        /* do not use LLTX in new drivers */
 #define NETIF_F_NETNS_LOCAL     8192    /* Does not change network namespaces */
 #define NETIF_F_MULTI_QUEUE     16384   /* Has multiple TX/RX queues */
 #define NETIF_F_LRO             32768   /* large receive offload */