Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e216975a authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

uapi: Convert some uses of 6 to ETH_ALEN 



Use the #define where appropriate.

Add #include <linux/if_ether.h>
where appropriate too.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bd3f5433

include/uapi/linux/dn.h

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define _LINUX_DN_H



#include <linux/types.h>

#include <linux/if_ether.h>



/*
@@ -120,7 +121,7 @@ struct linkinfo_dn { 
 * Ethernet address format (for DECnet)

 */

union etheraddress {

        __u8 dne_addr[6];             /* Full ethernet address */

        __u8 dne_addr[ETH_ALEN];      /* Full ethernet address */

  struct {

                __u8 dne_hiord[4];    /* DECnet HIORD prefix   */

                __u8 dne_nodeaddr[2]; /* DECnet node address   */

include/uapi/linux/if_bridge.h

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#define _UAPI_LINUX_IF_BRIDGE_H



#include <linux/types.h>

#include <linux/if_ether.h>



#define SYSFS_BRIDGE_ATTR	"bridge"

#define SYSFS_BRIDGE_FDB	"brforward"
@@ -88,7 +89,7 @@ struct __port_info { 
};



struct __fdb_entry {

	__u8 mac_addr[6];

	__u8 mac_addr[ETH_ALEN];

	__u8 port_no;

	__u8 is_local;

	__u32 ageing_timer_value;

include/uapi/linux/netfilter_bridge/ebt_802_3.h

+3 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define _UAPI__LINUX_BRIDGE_EBT_802_3_H



#include <linux/types.h>

#include <linux/if_ether.h>



#define EBT_802_3_SAP 0x01

#define EBT_802_3_TYPE 0x02
@@ -42,8 +43,8 @@ struct hdr_ni { 
};



struct ebt_802_3_hdr {

	__u8  daddr[6];

	__u8  saddr[6];

	__u8  daddr[ETH_ALEN];

	__u8  saddr[ETH_ALEN];

	__be16 len;

	union {

		struct hdr_ui ui;

include/uapi/linux/netfilter_ipv4/ipt_CLUSTERIP.h

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define _IPT_CLUSTERIP_H_target



#include <linux/types.h>

#include <linux/if_ether.h>



enum clusterip_hashmode {

    CLUSTERIP_HASHMODE_SIP = 0,
@@ -22,7 +23,7 @@ struct ipt_clusterip_tgt_info { 
	__u32 flags;



	/* only relevant for new ones */

	__u8 clustermac[6];

	__u8 clustermac[ETH_ALEN];

	__u16 num_total_nodes;

	__u16 num_local_nodes;

	__u16 local_nodes[CLUSTERIP_MAX_NODES];

include/uapi/linux/virtio_net.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 


struct virtio_net_config {

	/* The config defining mac address (if VIRTIO_NET_F_MAC) */

	__u8 mac[6];

	__u8 mac[ETH_ALEN];

	/* See VIRTIO_NET_F_STATUS and VIRTIO_NET_S_* above */

	__u16 status;

	/* Maximum number of each of transmit and receive queues;