From 77217a1edfc56caa6fd06d43cce7551bc9c479b0 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Thu, 26 Oct 2006 15:46:56 -0700
Subject: [PATCH] --- yaml --- r: 41661 b: refs/heads/master c:
 bf6bce71eae386dbc37f93af7e5ad173450d9945 h: refs/heads/master i:   41659:
 d932616cb1a9138674faf01b96297e0f68f6c798 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/netpoll.h | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 856bec55a172..99372c889232 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5de4a473bda49554e4e9bd93b78f43c49a7ea69c
+refs/heads/master: bf6bce71eae386dbc37f93af7e5ad173450d9945
diff --git a/trunk/include/linux/netpoll.h b/trunk/include/linux/netpoll.h
index b7eb008c43de..2cc9867b1626 100644
--- a/trunk/include/linux/netpoll.h
+++ b/trunk/include/linux/netpoll.h
@@ -12,16 +12,15 @@
 #include <linux/rcupdate.h>
 #include <linux/list.h>
 
-struct netpoll;
-
 struct netpoll {
 	struct net_device *dev;
-	char dev_name[16], *name;
+	char dev_name[IFNAMSIZ];
+	const char *name;
 	void (*rx_hook)(struct netpoll *, int, char *, int);
 
 	u32 local_ip, remote_ip;
 	u16 local_port, remote_port;
-	unsigned char local_mac[6], remote_mac[6];
+ 	u8 local_mac[ETH_ALEN], remote_mac[ETH_ALEN];
 };
 
 struct netpoll_info {