aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCong Wang <amwang@redhat.com>2013-02-14 13:32:31 +0800
committerDavid S. Miller <davem@davemloft.net>2013-02-14 00:54:17 -0500
commit9f89ec82521957de807dc0d56264ee226bbe9b98 (patch)
tree076e60276c730785a2324f3f6f3fd186709b9bde
parentMerge branch 'bridge_vlan' (diff)
downloadlinux-dev-9f89ec82521957de807dc0d56264ee226bbe9b98.tar.xz
linux-dev-9f89ec82521957de807dc0d56264ee226bbe9b98.zip
bridge: use __u16 in if_bridge.h
We should use "__u16" instead of "u16" in the user-space visable header. Cc: Vlad Yasevich <vyasevic@redhat.com> Cc: Stephen Hemminger <stephen@networkplumber.org> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Cong Wang <amwang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/uapi/linux/if_bridge.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index f1bf8d34ac9f..2d70d79ce2fd 100644
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -124,8 +124,8 @@ enum {
#define BRIDGE_VLAN_INFO_UNTAGGED (1<<2) /* VLAN egresses untagged */
struct bridge_vlan_info {
- u16 flags;
- u16 vid;
+ __u16 flags;
+ __u16 vid;
};
/* Bridge multicast database attributes