kgdb: Fix kernel-doc format error in kgdb.h

[safe/jmp/linux-2.6] / include / linux / if.h

diff --git a/include/linux/if.h b/include/linux/if.h
index 6524684..3a9f410 100644 (file)
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -65,6 +65,12 @@
 #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 IFF_WAN_HDLC   0x200           /* WAN HDLC device              */
+#define IFF_XMIT_DST_RELEASE 0x400     /* dev_hard_start_xmit() is allowed to
+                                        * release skb->dst
+                                        */
+#define IFF_DONT_BRIDGE 0x800          /* disallow bridging this ether dev */
 
 #define IF_GET_IFACE   0x0001          /* for querying only */
 #define IF_GET_PROTO   0x0002
@@ -120,8 +126,7 @@ enum {
  *     being very small might be worth keeping for clean configuration.
  */
 
-struct ifmap 
-{
+struct ifmap {
        unsigned long mem_start;
        unsigned long mem_end;
        unsigned short base_addr; 
@@ -131,8 +136,7 @@ struct ifmap
        /* 3 bytes spare */
 };
 
-struct if_settings
-{
+struct if_settings {
        unsigned int type;      /* Type of physical device or protocol */
        unsigned int size;      /* Size of the data allocated by the caller */
        union {
@@ -156,8 +160,7 @@ struct if_settings
  * remainder may be interface specific.
  */
 
-struct ifreq 
-{
+struct ifreq {
 #define IFHWADDRLEN    6
        union
        {
@@ -206,11 +209,9 @@ struct ifreq
  * must know all networks accessible).
  */
 
-struct ifconf 
-{
+struct ifconf  {
        int     ifc_len;                        /* size of buffer       */
-       union 
-       {
+       union {
                char __user *ifcu_buf;
                struct ifreq __user *ifcu_req;
        } ifc_ifcu;