diff options
author | Thomas Graf <tgraf@suug.ch> | 2013-03-29 09:46:51 -0400 |
---|---|---|
committer | Jesse Gross <jesse@nicira.com> | 2013-03-29 20:54:20 -0400 |
commit | 14b57a10553b5b768f77b247e6dd285c65816064 (patch) | |
tree | e9b041b805731fcc396788662c625d0ba63fbe1c | |
parent | ed661185859cecfcbe3a0e585563525498b3f405 (diff) |
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.h | 13 |
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 @@ | |||
20 | #define _LINUX_OPENVSWITCH_H 1 | 20 | #define _LINUX_OPENVSWITCH_H 1 |
21 | 21 | ||
22 | #include <linux/types.h> | 22 | #include <linux/types.h> |
23 | #include <linux/if_ether.h> | ||
23 | 24 | ||
24 | /** | 25 | /** |
25 | * struct ovs_header - header for OVS Generic Netlink messages. | 26 | * struct ovs_header - header for OVS Generic Netlink messages. |
@@ -269,8 +270,8 @@ enum ovs_frag_type { | |||
269 | #define OVS_FRAG_TYPE_MAX (__OVS_FRAG_TYPE_MAX - 1) | 270 | #define OVS_FRAG_TYPE_MAX (__OVS_FRAG_TYPE_MAX - 1) |
270 | 271 | ||
271 | struct ovs_key_ethernet { | 272 | struct ovs_key_ethernet { |
272 | __u8 eth_src[6]; | 273 | __u8 eth_src[ETH_ALEN]; |
273 | __u8 eth_dst[6]; | 274 | __u8 eth_dst[ETH_ALEN]; |
274 | }; | 275 | }; |
275 | 276 | ||
276 | struct ovs_key_ipv4 { | 277 | struct ovs_key_ipv4 { |
@@ -316,14 +317,14 @@ struct ovs_key_arp { | |||
316 | __be32 arp_sip; | 317 | __be32 arp_sip; |
317 | __be32 arp_tip; | 318 | __be32 arp_tip; |
318 | __be16 arp_op; | 319 | __be16 arp_op; |
319 | __u8 arp_sha[6]; | 320 | __u8 arp_sha[ETH_ALEN]; |
320 | __u8 arp_tha[6]; | 321 | __u8 arp_tha[ETH_ALEN]; |
321 | }; | 322 | }; |
322 | 323 | ||
323 | struct ovs_key_nd { | 324 | struct ovs_key_nd { |
324 | __u32 nd_target[4]; | 325 | __u32 nd_target[4]; |
325 | __u8 nd_sll[6]; | 326 | __u8 nd_sll[ETH_ALEN]; |
326 | __u8 nd_tll[6]; | 327 | __u8 nd_tll[ETH_ALEN]; |
327 | }; | 328 | }; |
328 | 329 | ||
329 | /** | 330 | /** |