diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /include/linux/if_addrlabel.h | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'include/linux/if_addrlabel.h')
| -rw-r--r-- | include/linux/if_addrlabel.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/if_addrlabel.h b/include/linux/if_addrlabel.h index 89571f65d6de..54580c298187 100644 --- a/include/linux/if_addrlabel.h +++ b/include/linux/if_addrlabel.h | |||
| @@ -12,8 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 14 | 14 | ||
| 15 | struct ifaddrlblmsg | 15 | struct ifaddrlblmsg { |
| 16 | { | ||
| 17 | __u8 ifal_family; /* Address family */ | 16 | __u8 ifal_family; /* Address family */ |
| 18 | __u8 __ifal_reserved; /* Reserved */ | 17 | __u8 __ifal_reserved; /* Reserved */ |
| 19 | __u8 ifal_prefixlen; /* Prefix length */ | 18 | __u8 ifal_prefixlen; /* Prefix length */ |
| @@ -22,8 +21,7 @@ struct ifaddrlblmsg | |||
| 22 | __u32 ifal_seq; /* sequence number */ | 21 | __u32 ifal_seq; /* sequence number */ |
| 23 | }; | 22 | }; |
| 24 | 23 | ||
| 25 | enum | 24 | enum { |
| 26 | { | ||
| 27 | IFAL_ADDRESS = 1, | 25 | IFAL_ADDRESS = 1, |
| 28 | IFAL_LABEL = 2, | 26 | IFAL_LABEL = 2, |
| 29 | __IFAL_MAX | 27 | __IFAL_MAX |
