Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 14b57a10553b5b768f77b247e6dd285c65816064

Authored by Thomas Graf
Committed by Jesse Gross
1 parent ed66118585
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

openvswitch: Use ETH_ALEN to define ethernet addresses 

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Jesse Gross <jesse@nicira.com>

Showing 1 changed file with 7 additions and 6 deletions Side-by-side Diff

include/linux/openvswitch.h
Diff comments   View file @ 14b57a1
... ... @@ -20,6 +20,7 @@
20 20 #define _LINUX_OPENVSWITCH_H 1
21 21  
22 22 #include <linux/types.h>
  23 +#include <linux/if_ether.h>
23 24  
24 25 /**
25 26 * struct ovs_header - header for OVS Generic Netlink messages.
... ... @@ -269,8 +270,8 @@
269 270 #define OVS_FRAG_TYPE_MAX (__OVS_FRAG_TYPE_MAX - 1)
270 271  
271 272 struct ovs_key_ethernet {
272   - __u8 eth_src[6];
273   - __u8 eth_dst[6];
  273 + __u8 eth_src[ETH_ALEN];
  274 + __u8 eth_dst[ETH_ALEN];
274 275 };
275 276  
276 277 struct ovs_key_ipv4 {
277 278  
... ... @@ -316,14 +317,14 @@
316 317 __be32 arp_sip;
317 318 __be32 arp_tip;
318 319 __be16 arp_op;
319   - __u8 arp_sha[6];
320   - __u8 arp_tha[6];
  320 + __u8 arp_sha[ETH_ALEN];
  321 + __u8 arp_tha[ETH_ALEN];
321 322 };
322 323  
323 324 struct ovs_key_nd {
324 325 __u32 nd_target[4];
325   - __u8 nd_sll[6];
326   - __u8 nd_tll[6];
  326 + __u8 nd_sll[ETH_ALEN];
  327 + __u8 nd_tll[ETH_ALEN];
327 328 };
328 329  
329 330 /**