summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2013-03-29 14:46:51 +0100
committerJesse Gross <jesse@nicira.com>2013-03-29 17:54:20 -0700
commit14b57a10553b5b768f77b247e6dd285c65816064 (patch)
treee9b041b805731fcc396788662c625d0ba63fbe1c
parented661185859cecfcbe3a0e585563525498b3f405 (diff)
downloadlinux-14b57a10553b5b768f77b247e6dd285c65816064.tar.gz
linux-14b57a10553b5b768f77b247e6dd285c65816064.tar.bz2
linux-14b57a10553b5b768f77b247e6dd285c65816064.zip
openvswitch: Use ETH_ALEN to define ethernet addresses
Signed-off-by: Thomas Graf <tgraf@suug.ch> Signed-off-by: Jesse Gross <jesse@nicira.com>
-rw-r--r--include/linux/openvswitch.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h
index 67d6c7b03581..8b9d7217eddc 100644
--- a/include/linux/openvswitch.h
+++ b/include/linux/openvswitch.h
@@ -20,6 +20,7 @@
#define _LINUX_OPENVSWITCH_H 1
#include <linux/types.h>
+#include <linux/if_ether.h>
/**
* struct ovs_header - header for OVS Generic Netlink messages.
@@ -269,8 +270,8 @@ enum ovs_frag_type {
#define OVS_FRAG_TYPE_MAX (__OVS_FRAG_TYPE_MAX - 1)
struct ovs_key_ethernet {
- __u8 eth_src[6];
- __u8 eth_dst[6];
+ __u8 eth_src[ETH_ALEN];
+ __u8 eth_dst[ETH_ALEN];
};
struct ovs_key_ipv4 {
@@ -316,14 +317,14 @@ struct ovs_key_arp {
__be32 arp_sip;
__be32 arp_tip;
__be16 arp_op;
- __u8 arp_sha[6];
- __u8 arp_tha[6];
+ __u8 arp_sha[ETH_ALEN];
+ __u8 arp_tha[ETH_ALEN];
};
struct ovs_key_nd {
__u32 nd_target[4];
- __u8 nd_sll[6];
- __u8 nd_tll[6];
+ __u8 nd_sll[ETH_ALEN];
+ __u8 nd_tll[ETH_ALEN];
};
/**