This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch upstream in repository hurd.
commit 115695afe34e5253816ff0e828054f8c07e2ddbd Author: Justus Winter <[email protected]> Date: Sat Nov 5 18:26:39 2016 +0100 eth-multiplexer: Avoid local definitions. * eth-multiplexer/util.h: Include 'net/if_ether.h'. (ETH_ALEN): Drop. (struct ethhdr): Likewise. * eth-multiplexer/vdev.c: Include 'net/if_ether.h'. (ETH_HLEN): Drop. --- eth-multiplexer/util.h | 10 +--------- eth-multiplexer/vdev.c | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/eth-multiplexer/util.h b/eth-multiplexer/util.h index b062638..1e062c4 100644 --- a/eth-multiplexer/util.h +++ b/eth-multiplexer/util.h @@ -27,6 +27,7 @@ #include <sys/types.h> #include <sys/socket.h> #include <arpa/inet.h> +#include <net/if_ether.h> #include <netinet/ip.h> #include <mach.h> @@ -56,15 +57,6 @@ backtrace_symbols_fd(array, size, fileno (stderr)); \ } while (0) -#define ETH_ALEN 6 /* Octets in one ethernet addr */ - -struct ethhdr -{ - unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ - unsigned char h_source[ETH_ALEN]; /* source ether addr */ - unsigned short h_proto; /* packet type ID field */ -}; - static inline void print_pack (char *packet, int len) { diff --git a/eth-multiplexer/vdev.c b/eth-multiplexer/vdev.c index a526bd2..e753b85 100644 --- a/eth-multiplexer/vdev.c +++ b/eth-multiplexer/vdev.c @@ -22,6 +22,7 @@ #include <string.h> #include <stdio.h> +#include <net/if_ether.h> #include <netinet/ip.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -35,7 +36,6 @@ #include "bpf_impl.h" #include "util.h" -#define ETH_HLEN sizeof (struct ethhdr) static struct vether_device *dev_head; static int dev_num; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/hurd.git
