bonding, net: Move last_rx update into bonding recv logic

[~andy/linux] / include / linux / if.h

diff --git a/include/linux/if.h b/include/linux/if.h
index 5c9d1fa93fef9f48852ce163f10badd26266f775..2a6e29620a963bcbfbd9195859fbab7c07f84266 100644 (file)
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -24,6 +24,7 @@
 #include <linux/compiler.h>            /* for "__user" et al           */
 
 #define        IFNAMSIZ        16
+#define        IFALIASZ        256
 #include <linux/hdlc/ioctl.h>
 
 /* Standard interface flags (netdevice->flags). */
@@ -64,6 +65,7 @@
 #define IFF_BONDING    0x20            /* bonding master or slave      */
 #define IFF_SLAVE_NEEDARP 0x40         /* need ARPs for validation     */
 #define IFF_ISATAP     0x80            /* ISATAP interface (RFC4214)   */
+#define IFF_MASTER_ARPMON 0x100                /* bonding master, ARP mon in use */
 
 #define IF_GET_IFACE   0x0001          /* for querying only */
 #define IF_GET_PROTO   0x0002